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

119
tests/Unit/Schema/Content/ToolResultContentTest.php Normal file
View file

@ -0,0 +1,119 @@
<?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\Schema\Content;
use Mcp\Exception\InvalidArgumentException;
use Mcp\Schema\Content\EmbeddedResource;
use Mcp\Schema\Content\ResourceLink;
use Mcp\Schema\Content\SamplingMessage;
use Mcp\Schema\Content\TextContent;
use Mcp\Schema\Content\ToolResultContent;
use Mcp\Schema\Enum\Role;
use PHPUnit\Framework\TestCase;
final class ToolResultContentTest extends TestCase
{
public function testRoundTrip(): void
{
$content = ToolResultContent::fromArray([
'type' => 'tool_result',
'toolUseId' => 'call-1',
'content' => [['type' => 'text', 'text' => '21 C']],
'structuredContent' => ['temperature' => 21],
'isError' => true,
'_meta' => ['provider' => 'test'],
]);
$this->assertSame('tool_result', $content->type);
$this->assertSame('call-1', $content->toolUseId);
$this->assertSame(['temperature' => 21], $content->structuredContent);
$this->assertTrue($content->isError);
$this->assertSame(['provider' => 'test'], $content->meta);
$textContent = $content->content[0];
$this->assertInstanceOf(TextContent::class, $textContent);
$this->assertSame('21 C', $textContent->text);
$restored = ToolResultContent::fromArray(json_decode(json_encode($content), true));
$this->assertEquals($content, $restored);
}
public function testIsErrorIsOmittedWhenFalse(): void
{
$content = new ToolResultContent('call-1', [new TextContent('ok')]);
$serialized = $content->jsonSerialize();
$this->assertArrayNotHasKey('isError', $serialized);
$this->assertArrayNotHasKey('structuredContent', $serialized);
$this->assertArrayNotHasKey('_meta', $serialized);
$this->assertFalse(ToolResultContent::fromArray(json_decode(json_encode($content), true))->isError);
}
public function testAcceptsEveryCallToolResultContentBlock(): void
{
$content = ToolResultContent::fromArray([
'toolUseId' => 'call-1',
'content' => [
['type' => 'text', 'text' => 'a'],
['type' => 'image', 'data' => base64_encode('img'), 'mimeType' => 'image/png'],
['type' => 'audio', 'data' => base64_encode('snd'), 'mimeType' => 'audio/wav'],
['type' => 'resource_link', 'uri' => 'file:///report.txt', 'name' => 'report'],
['type' => 'resource', 'resource' => ['uri' => 'file:///a.txt', 'mimeType' => 'text/plain', 'text' => 'a']],
],
]);
$this->assertInstanceOf(ResourceLink::class, $content->content[3]);
$this->assertInstanceOf(EmbeddedResource::class, $content->content[4]);
}
public function testFilteredContentStillSerializesAsAnArray(): void
{
$blocks = [new TextContent('drop me'), new TextContent('keep me')];
// array_filter() preserves keys, so this list starts at index 1.
$kept = array_filter($blocks, static fn (TextContent $block): bool => 'keep me' === $block->text);
$content = new ToolResultContent('call-1', $kept);
$this->assertSame(
'{"type":"tool_result","toolUseId":"call-1","content":[{"type":"text","text":"keep me"}]}',
json_encode($content),
);
}
public function testRejectsNonStandardContentBlocks(): void
{
$this->expectException(InvalidArgumentException::class);
/* @phpstan-ignore argument.type */
new ToolResultContent('call-1', [
new SamplingMessage(Role::User, new TextContent('not a tool result content block')),
]);
}
public function testRejectsUnsupportedContentType(): void
{
$this->expectException(InvalidArgumentException::class);
ToolResultContent::fromArray([
'toolUseId' => 'call-1',
'content' => [['type' => 'tool_use', 'id' => 'x', 'name' => 'y', 'input' => []]],
]);
}
public function testRejectsMissingToolUseId(): void
{
$this->expectException(InvalidArgumentException::class);
ToolResultContent::fromArray(['content' => []]);
}
}