modelcontextprotocol/php-sdk
Watch
1
0
Fork
You've already forked php-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Schema][Server] Harden sampling tools against the spec (#420)

Browse source 
* harden sampling tools against the spec

Report tool-flow violations as -32602 instead of dropping the request,
accept resource_link in tool results, gate tools on sampling.tools, and
reject empty content.

* normalize keyed content arrays to lists

array_filter() and friends preserve keys, and a keyed array serializes as a
JSON object instead of the content-block array the schema requires.
This commit is contained in:
Christopher Hertel 2026-08-15 04:13:53 +02:00 • committed by GitHub
commit 43815e38a8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1212 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

75
tests/Unit/Schema/Result/CreateSamplingMessageResultTest.php
View file

@ -11,8 +11,10 @@
namespace Mcp\Tests\Unit\Schema\Result;
use Mcp\Exception\InvalidArgumentException;
use Mcp\Schema\Content\TextContent;
use Mcp\Schema\Content\ToolUseContent;
use Mcp\Schema\Enum\Role;
use Mcp\Schema\Result\CreateSamplingMessageResult;
use PHPUnit\Framework\TestCase;
@ -50,4 +52,77 @@ final class CreateSamplingMessageResultTest extends TestCase
$this->assertSame('provider-specific', $result->stopReason);
$this->assertSame('provider-specific', $result->jsonSerialize()['stopReason']);
}
public function testKnownStopReasonStaysAString(): void
{
$result = CreateSamplingMessageResult::fromArray([
'role' => 'assistant',
'content' => ['type' => 'text', 'text' => 'Done'],
'model' => 'test-model',
'stopReason' => 'endTurn',
]);
$this->assertSame('endTurn', $result->stopReason);
}
public function testSingleContentBlockKeepsItsShape(): void
{
$result = CreateSamplingMessageResult::fromArray([
'role' => 'assistant',
'content' => ['type' => 'text', 'text' => 'Done'],
'model' => 'test-model',
]);
$this->assertInstanceOf(TextContent::class, $result->content);
$this->assertCount(1, $result->getContentBlocks());
$this->assertSame('{"type":"text","text":"Done"}', json_encode($result->jsonSerialize()['content']));
}
public function testFilteredContentStillSerializesAsAnArray(): void
{
$blocks = [new TextContent('thinking'), new ToolUseContent('call-1', 'weather', [])];
// array_filter() preserves keys, so this list starts at index 1.
$toolUses = array_filter($blocks, static fn ($block): bool => $block instanceof ToolUseContent);
$result = new CreateSamplingMessageResult(Role::Assistant, $toolUses, 'test-model');
$this->assertSame(
'[{"type":"tool_use","id":"call-1","name":"weather","input":{}}]',
json_encode($result->jsonSerialize()['content']),
);
}
public function testNonAssistantRoleIsRejected(): void
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('CreateSamplingMessageResult role must be "assistant".');
CreateSamplingMessageResult::fromArray([
'role' => 'user',
'content' => ['type' => 'text', 'text' => 'Done'],
'model' => 'test-model',
]);
}
public function testEmptyContentIsRejected(): void
{
$this->expectException(InvalidArgumentException::class);
CreateSamplingMessageResult::fromArray([
'role' => 'assistant',
'content' => [],
'model' => 'test-model',
]);
}
public function testToolResultContentIsRejected(): void
{
$this->expectException(InvalidArgumentException::class);
CreateSamplingMessageResult::fromArray([
'role' => 'assistant',
'content' => ['type' => 'tool_result', 'toolUseId' => 'call-1', 'content' => []],
'model' => 'test-model',
]);
}
}