* feat(schema): add top-level title to Tool Mirror PR #278's Prompt change for Tool: - Add optional ?string $title to Mcp\Schema\Tool between $name and $inputSchema. fromArray() now reads $data['title']; jsonSerialize() emits 'title' right after 'name'. The @phpstan-type ToolData gains title?: string. - Add ?string $title to the #[McpTool] attribute between $name and $description. - Note ToolAnnotations::$title as deprecated-for-display in favor of Tool::$title per MCP spec 2025-06-18 (PHPDoc only, field retained for BC). Phase 1 of plan 01--tool-title-spec-compliance. Later phases update Discoverer, Builder::addTool(), ArrayLoader, and the conformance fixture to match the new signature. * feat(server): thread title through discovery - Discoverer::processMethod() now propagates McpTool::$title into every discovered Tool via named arguments. - Builder::addTool() accepts ?string $title between $name and $description. [BC Break] positional callers passing the old $description as 3rd positional argument must switch to named arguments, matching the precedent set for addPrompt() in 0.5.0. - tests/Conformance/server.php migrated to named-argument form for every addTool() call. Phase 2 of plan 01--tool-title-spec-compliance. * feat(loader): forward title in ArrayLoader ArrayLoader now reads 'title' from each tool config entry and passes it into the Tool constructor, completing the wiring from Builder::addTool() through array-driven registration. The $tools @param array-shape typedef gains title: ?string between name and description. Phase 3 of plan 01--tool-title-spec-compliance. * test(schema): cover Tool.title end-to-end - New tests/Unit/Schema/ToolTest.php: constructor round-trip, jsonSerialize key-order when title set vs null, fromArray tolerance. - New tests/Unit/Capability/Discovery/DiscovererToolTitleTest plus a TitleFixture class verifying McpTool(title: ...) propagates through discovery into the registered Tool. - New tests/Unit/Capability/Registry/Loader/ArrayLoader... test verifying array-driven title propagation. - Extend McpToolTest for title named-arg and default-null. - Extend BuilderTest with addTool(title: 't') propagation. - Update tests/Unit/.../RegistryTest, CallToolHandlerTest, ListToolsHandlerTest and examples/.../server.php new Tool(...) call sites to pass title (named args) so they match the new constructor signature. - CHANGELOG 0.6.0 section: feature bullet + [BC Break] note for addTool() signature, mirroring 0.5.0 Prompt entries. - docs/server-builder.md: addTool() row and prose now list title? between name and description. Phase 4 of plan 01--tool-title-spec-compliance. All 730 phpunit tests pass; remaining phpstan warnings are pre-existing and unrelated to Tool.title. * refactor(schema): make Tool.title non-BC-breaking Move `title` to the end of the Tool, Builder::addTool, and McpTool attribute constructors with a default of null. This preserves positional-argument compatibility and removes the need for `title: null` boilerplate at call sites. JSON serialization order (name, title, inputSchema, ...) is unchanged. Also tighten the new tests: parameterize ToolTest with data providers, fold the Discoverer title fixture into the existing DiscoverableToolHandler, and drop the reflection-heavy Builder test that overlapped with ArrayLoaderToolTitleTest. * fix: move title after name --------- Co-authored-by: DDEV User <nobody@example.com>
549 lines
20 KiB
PHP
549 lines
20 KiB
PHP
<?php
|
|
|
|
/*
|
|
* This file is part of the official PHP MCP SDK.
|
|
*
|
|
* A collaboration between Symfony and the PHP Foundation.
|
|
*
|
|
* For the full copyright and license information, please view the LICENSE
|
|
* file that was distributed with this source code.
|
|
*/
|
|
|
|
namespace Mcp\Tests\Unit\Server\Handler\Request;
|
|
|
|
use Mcp\Capability\Registry\ReferenceHandlerInterface;
|
|
use Mcp\Capability\Registry\ToolReference;
|
|
use Mcp\Capability\RegistryInterface;
|
|
use Mcp\Exception\ToolCallException;
|
|
use Mcp\Exception\ToolNotFoundException;
|
|
use Mcp\Schema\Content\TextContent;
|
|
use Mcp\Schema\JsonRpc\Error;
|
|
use Mcp\Schema\JsonRpc\Response;
|
|
use Mcp\Schema\Request\CallToolRequest;
|
|
use Mcp\Schema\Result\CallToolResult;
|
|
use Mcp\Schema\Tool;
|
|
use Mcp\Server\Handler\Request\CallToolHandler;
|
|
use Mcp\Server\Session\SessionInterface;
|
|
use PHPUnit\Framework\MockObject\MockObject;
|
|
use PHPUnit\Framework\TestCase;
|
|
use Psr\Log\LoggerInterface;
|
|
|
|
class CallToolHandlerTest extends TestCase
|
|
{
|
|
private CallToolHandler $handler;
|
|
private RegistryInterface&MockObject $registry;
|
|
private ReferenceHandlerInterface&MockObject $referenceHandler;
|
|
private LoggerInterface&MockObject $logger;
|
|
private SessionInterface&MockObject $session;
|
|
|
|
protected function setUp(): void
|
|
{
|
|
$this->registry = $this->createMock(RegistryInterface::class);
|
|
$this->referenceHandler = $this->createMock(ReferenceHandlerInterface::class);
|
|
$this->logger = $this->createMock(LoggerInterface::class);
|
|
$this->session = $this->createMock(SessionInterface::class);
|
|
|
|
$this->handler = new CallToolHandler(
|
|
$this->registry,
|
|
$this->referenceHandler,
|
|
$this->logger,
|
|
);
|
|
}
|
|
|
|
public function testSupportsCallToolRequest(): void
|
|
{
|
|
$request = $this->createCallToolRequest('test_tool', ['param' => 'value']);
|
|
|
|
$this->assertTrue($this->handler->supports($request));
|
|
}
|
|
|
|
public function testHandleSuccessfulToolCall(): void
|
|
{
|
|
$request = $this->createCallToolRequest('greet_user', ['name' => 'John']);
|
|
$toolReference = $this->createToolReference('greet_user', static function () {
|
|
return 'Hello, John!';
|
|
});
|
|
$expectedResult = new CallToolResult([new TextContent('Hello, John!')]);
|
|
|
|
$this->registry
|
|
->expects($this->once())
|
|
->method('getTool')
|
|
->with('greet_user')
|
|
->willReturn($toolReference);
|
|
|
|
$this->referenceHandler
|
|
->expects($this->once())
|
|
->method('handle')
|
|
->with($toolReference, ['name' => 'John', '_session' => $this->session, '_request' => $request])
|
|
->willReturn('Hello, John!');
|
|
|
|
$toolReference
|
|
->expects($this->once())
|
|
->method('formatResult')
|
|
->with('Hello, John!')
|
|
->willReturn([new TextContent('Hello, John!')]);
|
|
|
|
// Logger may be called for debugging, so we don't assert never()
|
|
|
|
$response = $this->handler->handle($request, $this->session);
|
|
|
|
$this->assertInstanceOf(Response::class, $response);
|
|
$this->assertEquals($request->getId(), $response->id);
|
|
$this->assertEquals($expectedResult, $response->result);
|
|
}
|
|
|
|
public function testHandleToolCallWithEmptyArguments(): void
|
|
{
|
|
$request = $this->createCallToolRequest('simple_tool', []);
|
|
$toolReference = $this->createToolReference('greet_user', static function () {
|
|
return 'Hello, John!';
|
|
});
|
|
$expectedResult = new CallToolResult([new TextContent('Simple result')]);
|
|
|
|
$this->registry
|
|
->expects($this->once())
|
|
->method('getTool')
|
|
->with('simple_tool')
|
|
->willReturn($toolReference);
|
|
|
|
$this->referenceHandler
|
|
->expects($this->once())
|
|
->method('handle')
|
|
->with($toolReference, ['_session' => $this->session, '_request' => $request])
|
|
->willReturn('Simple result');
|
|
|
|
$toolReference
|
|
->expects($this->once())
|
|
->method('formatResult')
|
|
->with('Simple result')
|
|
->willReturn([new TextContent('Simple result')]);
|
|
|
|
$response = $this->handler->handle($request, $this->session);
|
|
|
|
$this->assertInstanceOf(Response::class, $response);
|
|
$this->assertEquals($expectedResult, $response->result);
|
|
}
|
|
|
|
public function testHandleToolCallWithComplexArguments(): void
|
|
{
|
|
$arguments = [
|
|
'string_param' => 'value',
|
|
'int_param' => 42,
|
|
'bool_param' => true,
|
|
'array_param' => ['nested' => 'data'],
|
|
'null_param' => null,
|
|
];
|
|
$request = $this->createCallToolRequest('complex_tool', $arguments);
|
|
$toolReference = $this->createToolReference('greet_user', static function () {
|
|
return 'Hello, John!';
|
|
});
|
|
$expectedResult = new CallToolResult([new TextContent('Complex result')]);
|
|
|
|
$this->registry
|
|
->expects($this->once())
|
|
->method('getTool')
|
|
->with('complex_tool')
|
|
->willReturn($toolReference);
|
|
|
|
$this->referenceHandler
|
|
->expects($this->once())
|
|
->method('handle')
|
|
->with($toolReference, array_merge($arguments, ['_session' => $this->session, '_request' => $request]))
|
|
->willReturn('Complex result');
|
|
|
|
$toolReference
|
|
->expects($this->once())
|
|
->method('formatResult')
|
|
->with('Complex result')
|
|
->willReturn([new TextContent('Complex result')]);
|
|
|
|
$response = $this->handler->handle($request, $this->session);
|
|
|
|
$this->assertInstanceOf(Response::class, $response);
|
|
$this->assertEquals($expectedResult, $response->result);
|
|
}
|
|
|
|
public function testHandleToolNotFoundExceptionReturnsError(): void
|
|
{
|
|
$request = $this->createCallToolRequest('nonexistent_tool', ['param' => 'value']);
|
|
|
|
$this->registry
|
|
->expects($this->once())
|
|
->method('getTool')
|
|
->with('nonexistent_tool')
|
|
->willThrowException(new ToolNotFoundException('nonexistent_tool'));
|
|
|
|
$this->logger
|
|
->expects($this->once())
|
|
->method('error');
|
|
|
|
$response = $this->handler->handle($request, $this->session);
|
|
|
|
$this->assertInstanceOf(Error::class, $response);
|
|
$this->assertEquals($request->getId(), $response->id);
|
|
$this->assertEquals(Error::METHOD_NOT_FOUND, $response->code);
|
|
}
|
|
|
|
public function testHandleToolCallExceptionReturnsResponseWithErrorResult(): void
|
|
{
|
|
$request = $this->createCallToolRequest('failing_tool', ['param' => 'value']);
|
|
$exception = new ToolCallException('Tool execution failed');
|
|
|
|
$toolReference = $this->createToolReference('greet_user', static function () {
|
|
return 'Hello, John!';
|
|
});
|
|
$this->registry
|
|
->expects($this->once())
|
|
->method('getTool')
|
|
->with('failing_tool')
|
|
->willReturn($toolReference);
|
|
|
|
$this->referenceHandler
|
|
->expects($this->once())
|
|
->method('handle')
|
|
->with($toolReference, ['param' => 'value', '_session' => $this->session, '_request' => $request])
|
|
->willThrowException($exception);
|
|
|
|
$this->logger
|
|
->expects($this->once())
|
|
->method('error');
|
|
|
|
$response = $this->handler->handle($request, $this->session);
|
|
|
|
$this->assertInstanceOf(Response::class, $response);
|
|
$this->assertEquals($request->getId(), $response->id);
|
|
|
|
$result = $response->result;
|
|
$this->assertInstanceOf(CallToolResult::class, $result);
|
|
$this->assertTrue($result->isError);
|
|
$this->assertCount(1, $result->content);
|
|
$this->assertInstanceOf(TextContent::class, $result->content[0]);
|
|
$this->assertEquals('Tool execution failed', $result->content[0]->text);
|
|
}
|
|
|
|
public function testHandleWithNullResult(): void
|
|
{
|
|
$request = $this->createCallToolRequest('null_tool', []);
|
|
$expectedResult = new CallToolResult([]);
|
|
|
|
$toolReference = $this->createToolReference('greet_user', static function () {
|
|
return 'Hello, John!';
|
|
});
|
|
$this->registry
|
|
->expects($this->once())
|
|
->method('getTool')
|
|
->with('null_tool')
|
|
->willReturn($toolReference);
|
|
|
|
$this->referenceHandler
|
|
->expects($this->once())
|
|
->method('handle')
|
|
->with($toolReference, ['_session' => $this->session, '_request' => $request])
|
|
->willReturn(null);
|
|
|
|
$toolReference
|
|
->expects($this->once())
|
|
->method('formatResult')
|
|
->with(null)
|
|
->willReturn([]);
|
|
|
|
$response = $this->handler->handle($request, $this->session);
|
|
|
|
$this->assertInstanceOf(Response::class, $response);
|
|
$this->assertEquals($expectedResult, $response->result);
|
|
}
|
|
|
|
public function testConstructorWithDefaultLogger(): void
|
|
{
|
|
$handler = new CallToolHandler($this->registry, $this->referenceHandler);
|
|
|
|
$this->assertInstanceOf(CallToolHandler::class, $handler);
|
|
}
|
|
|
|
public function testHandleLogsErrorWithCorrectParameters(): void
|
|
{
|
|
$request = $this->createCallToolRequest('test_tool', ['key1' => 'value1', 'key2' => 42]);
|
|
$exception = new ToolCallException('Custom error message');
|
|
|
|
$toolReference = $this->createToolReference('greet_user', static function () {
|
|
return 'Hello, John!';
|
|
});
|
|
$this->registry
|
|
->expects($this->once())
|
|
->method('getTool')
|
|
->with('test_tool')
|
|
->willReturn($toolReference);
|
|
|
|
$this->referenceHandler
|
|
->expects($this->once())
|
|
->method('handle')
|
|
->with($toolReference, ['key1' => 'value1', 'key2' => 42, '_session' => $this->session, '_request' => $request])
|
|
->willThrowException($exception);
|
|
|
|
$this->logger
|
|
->expects($this->once())
|
|
->method('error')
|
|
->with(
|
|
'Error while executing tool "test_tool": "Custom error message".',
|
|
[
|
|
'tool' => 'test_tool',
|
|
'arguments' => ['key1' => 'value1', 'key2' => 42, '_session' => $this->session, '_request' => $request],
|
|
],
|
|
);
|
|
|
|
$response = $this->handler->handle($request, $this->session);
|
|
|
|
// ToolCallException should now return Response with CallToolResult having isError=true
|
|
$this->assertInstanceOf(Response::class, $response);
|
|
$this->assertEquals($request->getId(), $response->id);
|
|
|
|
$result = $response->result;
|
|
$this->assertInstanceOf(CallToolResult::class, $result);
|
|
$this->assertTrue($result->isError);
|
|
$this->assertCount(1, $result->content);
|
|
$this->assertInstanceOf(TextContent::class, $result->content[0]);
|
|
$this->assertEquals('Custom error message', $result->content[0]->text);
|
|
}
|
|
|
|
public function testHandleGenericExceptionReturnsError(): void
|
|
{
|
|
$request = $this->createCallToolRequest('failing_tool', ['param' => 'value']);
|
|
$exception = new \RuntimeException('Internal database connection failed');
|
|
|
|
$toolReference = $this->createToolReference('greet_user', static function () {
|
|
return 'Hello, John!';
|
|
});
|
|
$this->registry
|
|
->expects($this->once())
|
|
->method('getTool')
|
|
->with('failing_tool')
|
|
->willReturn($toolReference);
|
|
|
|
$this->referenceHandler
|
|
->expects($this->once())
|
|
->method('handle')
|
|
->with($toolReference, ['param' => 'value', '_session' => $this->session, '_request' => $request])
|
|
->willThrowException($exception);
|
|
|
|
$response = $this->handler->handle($request, $this->session);
|
|
|
|
// Generic exceptions should return Error, not Response
|
|
$this->assertInstanceOf(Error::class, $response);
|
|
$this->assertEquals($request->getId(), $response->id);
|
|
$this->assertEquals(Error::INTERNAL_ERROR, $response->code);
|
|
$this->assertEquals('Error while executing tool', $response->message);
|
|
}
|
|
|
|
public function testHandleWithSpecialCharactersInToolName(): void
|
|
{
|
|
$request = $this->createCallToolRequest('tool-with_special.chars', []);
|
|
$expectedResult = new CallToolResult([new TextContent('Special tool result')]);
|
|
|
|
$toolReference = $this->createToolReference('greet_user', static function () {
|
|
return 'Hello, John!';
|
|
});
|
|
|
|
$this->registry
|
|
->expects($this->once())
|
|
->method('getTool')
|
|
->with('tool-with_special.chars')
|
|
->willReturn($toolReference);
|
|
|
|
$this->referenceHandler
|
|
->expects($this->once())
|
|
->method('handle')
|
|
->with($toolReference, ['_session' => $this->session, '_request' => $request])
|
|
->willReturn('Special tool result');
|
|
|
|
$toolReference
|
|
->expects($this->once())
|
|
->method('formatResult')
|
|
->with('Special tool result')
|
|
->willReturn([new TextContent('Special tool result')]);
|
|
|
|
$response = $this->handler->handle($request, $this->session);
|
|
|
|
$this->assertInstanceOf(Response::class, $response);
|
|
$this->assertEquals($expectedResult, $response->result);
|
|
}
|
|
|
|
public function testHandleWithSpecialCharactersInArguments(): void
|
|
{
|
|
$arguments = [
|
|
'special_chars' => 'äöü ñ 中文 🚀',
|
|
'unicode' => '\\u{1F600}',
|
|
'quotes' => 'text with "quotes" and \'single quotes\'',
|
|
];
|
|
$request = $this->createCallToolRequest('unicode_tool', $arguments);
|
|
$expectedResult = new CallToolResult([new TextContent('Unicode handled')]);
|
|
|
|
$toolReference = $this->createToolReference('greet_user', static function () {
|
|
return 'Hello, John!';
|
|
});
|
|
$this->registry
|
|
->expects($this->once())
|
|
->method('getTool')
|
|
->with('unicode_tool')
|
|
->willReturn($toolReference);
|
|
|
|
$this->referenceHandler
|
|
->expects($this->once())
|
|
->method('handle')
|
|
->with($toolReference, array_merge($arguments, ['_session' => $this->session, '_request' => $request]))
|
|
->willReturn('Unicode handled');
|
|
|
|
$toolReference
|
|
->expects($this->once())
|
|
->method('formatResult')
|
|
->with('Unicode handled')
|
|
->willReturn([new TextContent('Unicode handled')]);
|
|
|
|
$response = $this->handler->handle($request, $this->session);
|
|
|
|
$this->assertInstanceOf(Response::class, $response);
|
|
$this->assertEquals($expectedResult, $response->result);
|
|
}
|
|
|
|
public function testHandleReturnsStructuredContentResult(): void
|
|
{
|
|
$request = $this->createCallToolRequest('structured_tool', ['query' => 'php']);
|
|
$toolReference = $this->createToolReference('greet_user', static function () {
|
|
return 'Hello, John!';
|
|
});
|
|
$structuredResult = new CallToolResult([new TextContent('Rendered results')], false, ['result' => 'Rendered results']);
|
|
|
|
$this->registry
|
|
->expects($this->once())
|
|
->method('getTool')
|
|
->with('structured_tool')
|
|
->willReturn($toolReference);
|
|
|
|
$this->referenceHandler
|
|
->expects($this->once())
|
|
->method('handle')
|
|
->with($toolReference, ['query' => 'php', '_session' => $this->session, '_request' => $request])
|
|
->willReturn($structuredResult);
|
|
|
|
$toolReference
|
|
->expects($this->never())
|
|
->method('formatResult');
|
|
|
|
$response = $this->handler->handle($request, $this->session);
|
|
|
|
$this->assertInstanceOf(Response::class, $response);
|
|
$this->assertSame($structuredResult, $response->result);
|
|
$this->assertEquals(['result' => 'Rendered results'], $response->result->jsonSerialize()['structuredContent'] ?? []);
|
|
}
|
|
|
|
public function testHandleReturnsCallToolResult(): void
|
|
{
|
|
$request = $this->createCallToolRequest('result_tool', ['query' => 'php']);
|
|
$toolReference = $this->createToolReference('greet_user', static function () {
|
|
return 'Hello, John!';
|
|
});
|
|
$callToolResult = new CallToolResult([new TextContent('Error result')], true);
|
|
|
|
$this->registry
|
|
->expects($this->once())
|
|
->method('getTool')
|
|
->with('result_tool')
|
|
->willReturn($toolReference);
|
|
|
|
$this->referenceHandler
|
|
->expects($this->once())
|
|
->method('handle')
|
|
->with($toolReference, ['query' => 'php', '_session' => $this->session, '_request' => $request])
|
|
->willReturn($callToolResult);
|
|
|
|
$toolReference
|
|
->expects($this->never())
|
|
->method('formatResult');
|
|
|
|
$response = $this->handler->handle($request, $this->session);
|
|
|
|
$this->assertInstanceOf(Response::class, $response);
|
|
$this->assertSame($callToolResult, $response->result);
|
|
$this->assertArrayNotHasKey('structuredContent', $response->result->jsonSerialize());
|
|
}
|
|
|
|
public function testValidationError(): void
|
|
{
|
|
$schema = [
|
|
'type' => 'object',
|
|
'properties' => [
|
|
'favorite_number' => [
|
|
'type' => 'number',
|
|
'description' => 'Your favorite number',
|
|
],
|
|
],
|
|
'required' => [
|
|
'favorite_number',
|
|
],
|
|
];
|
|
|
|
$request = $this->createCallToolRequest('result_tool', ['query' => 'php']);
|
|
$toolReference = $this->getMockBuilder(ToolReference::class)
|
|
->setConstructorArgs([new Tool('simple_tool', null, $schema, null, null), static function () {}])
|
|
->getMock();
|
|
|
|
$this->registry
|
|
->expects($this->once())
|
|
->method('getTool')
|
|
->with('result_tool')
|
|
->willReturn($toolReference);
|
|
|
|
$this->referenceHandler
|
|
->expects($this->never())
|
|
->method('handle');
|
|
|
|
$response = $this->handler->handle($request, $this->session);
|
|
|
|
$this->assertInstanceOf(Error::class, $response);
|
|
$this->assertEquals($request->getId(), $response->id);
|
|
$this->assertEquals(Error::INVALID_PARAMS, $response->code);
|
|
}
|
|
|
|
/**
|
|
* @param array<string, mixed> $arguments
|
|
*/
|
|
private function createCallToolRequest(string $name, array $arguments): CallToolRequest
|
|
{
|
|
return CallToolRequest::fromArray([
|
|
'jsonrpc' => '2.0',
|
|
'method' => CallToolRequest::getMethod(),
|
|
'id' => 'test-request-'.uniqid(),
|
|
'params' => [
|
|
'name' => $name,
|
|
'arguments' => $arguments,
|
|
],
|
|
]);
|
|
}
|
|
|
|
private function createToolReference(
|
|
string $name,
|
|
callable $handler,
|
|
?array $outputSchema = null,
|
|
array $methodsToMock = ['formatResult'],
|
|
): ToolReference&MockObject {
|
|
$schema = [
|
|
'type' => 'object',
|
|
'properties' => [
|
|
'example' => [
|
|
'type' => 'string',
|
|
'description' => 'This is just a dummy',
|
|
],
|
|
],
|
|
'required' => [],
|
|
];
|
|
$tool = new Tool($name, null, $schema, null, null, null, null, $outputSchema);
|
|
|
|
$builder = $this->getMockBuilder(ToolReference::class)
|
|
->setConstructorArgs([$tool, $handler]);
|
|
|
|
if (!empty($methodsToMock)) {
|
|
$builder->onlyMethods($methodsToMock);
|
|
}
|
|
|
|
return $builder->getMock();
|
|
}
|
|
}
|