* Address review feedback on resource_link Three follow-ups from review of the resource_link work: * PromptResultFormatter: add a regression test proving the optional fields of a typed resource_link block (title, description, mimeType, size, annotations, _meta) survive formatting. The delegation to ResourceLink::fromArray() already landed while rebasing onto the PromptResultFormatter refactor, but the existing test only supplied uri/name and so could not catch a reintroduced field drop. * ResourceLink::fromArray(): validate optional fields consistently, the way the equivalent ResourceDefinition::fromArray() already does. description, mimeType and size now raise InvalidArgumentException instead of surfacing a TypeError (or silently coercing, for size's (int) cast); annotations goes through Annotations::tryFromArray(), which carries the is_array() guard that icons already had; icons uses Icon::listFromArray() so a non-array entry is reported in context. * ToolReference::extractStructuredContent(): never emit a list as structuredContent. The Content guard added earlier fixed only one instance of the real invariant - structuredContent must be a JSON object, and a PHP list can never be one. Tool::fromArray() already enforces the matching rule by rejecting an outputSchema whose type is not "object", so this aligns the runtime path with it. The test asserting the opposite for an array-typed outputSchema contradicted the phpstan type and the fromArray() check introduced alongside it in the same commit, so it is replaced by tests for the two list shapes. * Apply the structuredContent object rule to object results too `extractStructuredContent()` guards raw array results against being emitted as a JSON array, but the object branch handed back whatever `json_decode()` produced. A `JsonSerializable` returning a list or a scalar slipped straight through, producing exactly the `structuredContent` the array guard exists to prevent — and a return value that contradicts the method's own `array<string, mixed>|null` signature. Check the decoded value before returning it, and cover the object branch, which had no tests at all. * Document structured tool output `outputSchema` and `structuredContent` were undocumented: the tool return value docs covered only the `content` side, and the schema generation section is about tool parameters. Add a "Structured Output" subsection covering how to declare the schema, which return values populate `structuredContent`, and why a list has to be wrapped in a key to get structured output at all. * Gate structuredContent on the negotiated protocol revision SEP-2106 (revision 2026-07-28) widens structuredContent to any JSON value; earlier revisions require an object. Resolve the revision per request and apply the matching rule, and warn when a declared outputSchema yields none. * Resolve the protocol revision on RequestContext Keeps the `_meta`-then-session lookup in one place instead of per handler, and exposes the negotiated revision to tool handlers. * Document reading the negotiated revision from RequestContext * Warn when a self-built CallToolResult carries an invalid structuredContent Returning a CallToolResult opts out of the extraction rules, so the value is still sent unchanged — but a JSON array is not valid before SEP-2106.
251 lines
9.5 KiB
PHP
251 lines
9.5 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\Schema\Content;
|
|
|
|
use Mcp\Exception\InvalidArgumentException;
|
|
use Mcp\Schema\Annotations;
|
|
use Mcp\Schema\Content\ResourceLink;
|
|
use Mcp\Schema\Enum\Role;
|
|
use Mcp\Schema\Icon;
|
|
use PHPUnit\Framework\Attributes\DataProvider;
|
|
use PHPUnit\Framework\TestCase;
|
|
|
|
final class ResourceLinkTest extends TestCase
|
|
{
|
|
private const VALID_URI = 'file:///project/src/main.rs';
|
|
|
|
public function testConstructorSetsType(): void
|
|
{
|
|
$link = new ResourceLink(self::VALID_URI, 'main.rs');
|
|
|
|
$this->assertSame('resource_link', $link->type);
|
|
$this->assertSame(self::VALID_URI, $link->uri);
|
|
$this->assertSame('main.rs', $link->name);
|
|
$this->assertNull($link->title);
|
|
$this->assertNull($link->description);
|
|
$this->assertNull($link->mimeType);
|
|
$this->assertNull($link->annotations);
|
|
$this->assertNull($link->size);
|
|
$this->assertNull($link->icons);
|
|
$this->assertNull($link->meta);
|
|
}
|
|
|
|
public function testConstructorWithAllFields(): void
|
|
{
|
|
$annotations = new Annotations([Role::User], 0.5);
|
|
$icons = [new Icon('https://example.com/icon.png')];
|
|
|
|
$link = new ResourceLink(
|
|
uri: self::VALID_URI,
|
|
name: 'main.rs',
|
|
title: 'Main Source File',
|
|
description: 'Primary application entry point',
|
|
mimeType: 'text/x-rust',
|
|
annotations: $annotations,
|
|
size: 1024,
|
|
icons: $icons,
|
|
meta: ['origin' => 'test'],
|
|
);
|
|
|
|
$this->assertSame(self::VALID_URI, $link->uri);
|
|
$this->assertSame('main.rs', $link->name);
|
|
$this->assertSame('Main Source File', $link->title);
|
|
$this->assertSame('Primary application entry point', $link->description);
|
|
$this->assertSame('text/x-rust', $link->mimeType);
|
|
$this->assertSame($annotations, $link->annotations);
|
|
$this->assertSame(1024, $link->size);
|
|
$this->assertSame($icons, $link->icons);
|
|
$this->assertSame(['origin' => 'test'], $link->meta);
|
|
}
|
|
|
|
public function testJsonSerializeMinimal(): void
|
|
{
|
|
$link = new ResourceLink(self::VALID_URI, 'main.rs');
|
|
|
|
$this->assertSame([
|
|
'type' => 'resource_link',
|
|
'uri' => self::VALID_URI,
|
|
'name' => 'main.rs',
|
|
], $link->jsonSerialize());
|
|
}
|
|
|
|
public function testJsonSerializeWithAllFields(): void
|
|
{
|
|
$annotations = new Annotations([Role::User], 0.5);
|
|
$icons = [new Icon('https://example.com/icon.png')];
|
|
|
|
$link = new ResourceLink(
|
|
uri: self::VALID_URI,
|
|
name: 'main.rs',
|
|
title: 'Main Source File',
|
|
description: 'Primary application entry point',
|
|
mimeType: 'text/x-rust',
|
|
annotations: $annotations,
|
|
size: 1024,
|
|
icons: $icons,
|
|
meta: ['origin' => 'test'],
|
|
);
|
|
|
|
$data = $link->jsonSerialize();
|
|
|
|
$this->assertSame('resource_link', $data['type']);
|
|
$this->assertSame(self::VALID_URI, $data['uri']);
|
|
$this->assertSame('main.rs', $data['name']);
|
|
$this->assertSame('Main Source File', $data['title']);
|
|
$this->assertSame('Primary application entry point', $data['description']);
|
|
$this->assertSame('text/x-rust', $data['mimeType']);
|
|
$this->assertSame($annotations, $data['annotations']);
|
|
$this->assertSame(1024, $data['size']);
|
|
$this->assertSame($icons, $data['icons']);
|
|
$this->assertSame(['origin' => 'test'], $data['_meta']);
|
|
}
|
|
|
|
public function testOptionalFieldsOmittedWhenNull(): void
|
|
{
|
|
$link = new ResourceLink(self::VALID_URI, 'main.rs');
|
|
$data = $link->jsonSerialize();
|
|
|
|
$this->assertArrayNotHasKey('title', $data);
|
|
$this->assertArrayNotHasKey('description', $data);
|
|
$this->assertArrayNotHasKey('mimeType', $data);
|
|
$this->assertArrayNotHasKey('annotations', $data);
|
|
$this->assertArrayNotHasKey('size', $data);
|
|
$this->assertArrayNotHasKey('icons', $data);
|
|
$this->assertArrayNotHasKey('_meta', $data);
|
|
}
|
|
|
|
public function testFromArrayMinimal(): void
|
|
{
|
|
$link = ResourceLink::fromArray([
|
|
'type' => 'resource_link',
|
|
'uri' => self::VALID_URI,
|
|
'name' => 'main.rs',
|
|
]);
|
|
|
|
$this->assertSame(self::VALID_URI, $link->uri);
|
|
$this->assertSame('main.rs', $link->name);
|
|
$this->assertNull($link->title);
|
|
$this->assertNull($link->annotations);
|
|
$this->assertNull($link->icons);
|
|
$this->assertNull($link->meta);
|
|
}
|
|
|
|
public function testFromArrayWithAllFields(): void
|
|
{
|
|
$link = ResourceLink::fromArray([
|
|
'type' => 'resource_link',
|
|
'uri' => self::VALID_URI,
|
|
'name' => 'main.rs',
|
|
'title' => 'Main Source File',
|
|
'description' => 'Primary application entry point',
|
|
'mimeType' => 'text/x-rust',
|
|
'annotations' => ['audience' => ['user'], 'priority' => 0.5],
|
|
'size' => 1024,
|
|
'icons' => [['src' => 'https://example.com/icon.png']],
|
|
'_meta' => ['origin' => 'test'],
|
|
]);
|
|
|
|
$this->assertSame('Main Source File', $link->title);
|
|
$this->assertSame('Primary application entry point', $link->description);
|
|
$this->assertSame('text/x-rust', $link->mimeType);
|
|
$this->assertInstanceOf(Annotations::class, $link->annotations);
|
|
$this->assertSame(1024, $link->size);
|
|
$this->assertCount(1, $link->icons);
|
|
$this->assertInstanceOf(Icon::class, $link->icons[0]);
|
|
$this->assertSame(['origin' => 'test'], $link->meta);
|
|
}
|
|
|
|
public function testRoundTripThroughJsonSerializeAndFromArray(): void
|
|
{
|
|
$original = new ResourceLink(
|
|
uri: self::VALID_URI,
|
|
name: 'main.rs',
|
|
title: 'Main Source File',
|
|
description: 'Primary application entry point',
|
|
mimeType: 'text/x-rust',
|
|
annotations: new Annotations([Role::User], 0.5),
|
|
size: 1024,
|
|
icons: [new Icon('https://example.com/icon.png')],
|
|
meta: ['origin' => 'test'],
|
|
);
|
|
|
|
$decoded = json_decode(json_encode($original), true);
|
|
$rehydrated = ResourceLink::fromArray($decoded);
|
|
|
|
$this->assertSame($original->uri, $rehydrated->uri);
|
|
$this->assertSame($original->name, $rehydrated->name);
|
|
$this->assertSame($original->title, $rehydrated->title);
|
|
$this->assertSame($original->description, $rehydrated->description);
|
|
$this->assertSame($original->mimeType, $rehydrated->mimeType);
|
|
$this->assertSame($original->size, $rehydrated->size);
|
|
$this->assertSame($original->meta, $rehydrated->meta);
|
|
$this->assertEquals($original->annotations, $rehydrated->annotations);
|
|
}
|
|
|
|
public function testFromArrayRejectsWrongType(): void
|
|
{
|
|
$this->expectException(InvalidArgumentException::class);
|
|
$this->expectExceptionMessage('Invalid type for ResourceLink.');
|
|
|
|
/* @phpstan-ignore argument.type */
|
|
ResourceLink::fromArray([
|
|
'type' => 'resource',
|
|
'uri' => self::VALID_URI,
|
|
'name' => 'main.rs',
|
|
]);
|
|
}
|
|
|
|
#[DataProvider('provideInvalidData')]
|
|
public function testFromArrayRejectsInvalidData(array $input, string $expectedExceptionMessage): void
|
|
{
|
|
$this->expectException(InvalidArgumentException::class);
|
|
$this->expectExceptionMessage($expectedExceptionMessage);
|
|
|
|
ResourceLink::fromArray($input);
|
|
}
|
|
|
|
public static function provideInvalidData(): iterable
|
|
{
|
|
yield 'missing uri' => [
|
|
['type' => 'resource_link', 'name' => 'main.rs'],
|
|
'Invalid or missing "uri" in ResourceLink data.',
|
|
];
|
|
yield 'missing name' => [
|
|
['type' => 'resource_link', 'uri' => self::VALID_URI],
|
|
'Invalid or missing "name" in ResourceLink data.',
|
|
];
|
|
yield 'invalid _meta' => [
|
|
['type' => 'resource_link', 'uri' => self::VALID_URI, 'name' => 'main.rs', '_meta' => 'not-an-array'],
|
|
'Invalid "_meta" in ResourceLink data.',
|
|
];
|
|
yield 'invalid description' => [
|
|
['type' => 'resource_link', 'uri' => self::VALID_URI, 'name' => 'main.rs', 'description' => ['not-a-string']],
|
|
'Invalid "description" in ResourceLink data.',
|
|
];
|
|
yield 'invalid mimeType' => [
|
|
['type' => 'resource_link', 'uri' => self::VALID_URI, 'name' => 'main.rs', 'mimeType' => ['not-a-string']],
|
|
'Invalid "mimeType" in ResourceLink data.',
|
|
];
|
|
yield 'invalid size' => [
|
|
['type' => 'resource_link', 'uri' => self::VALID_URI, 'name' => 'main.rs', 'size' => 'not-an-int'],
|
|
'Invalid "size" in ResourceLink data; expected an integer.',
|
|
];
|
|
yield 'invalid annotations' => [
|
|
['type' => 'resource_link', 'uri' => self::VALID_URI, 'name' => 'main.rs', 'annotations' => 'not-an-array'],
|
|
'Invalid "annotations" in ResourceLink data; expected an array.',
|
|
];
|
|
yield 'invalid icons entry' => [
|
|
['type' => 'resource_link', 'uri' => self::VALID_URI, 'name' => 'main.rs', 'icons' => ['not-an-array']],
|
|
'Each entry in "icons" of ResourceLink data must be an array.',
|
|
];
|
|
}
|
|
}
|