* 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.
144 lines
5.8 KiB
PHP
144 lines
5.8 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\Enum;
|
|
|
|
use Mcp\Schema\Enum\ProtocolVersion;
|
|
use PHPUnit\Framework\Attributes\DataProvider;
|
|
use PHPUnit\Framework\Attributes\TestDox;
|
|
use PHPUnit\Framework\TestCase;
|
|
|
|
class ProtocolVersionTest extends TestCase
|
|
{
|
|
#[TestDox('comparisons follow declaration order, whatever shape the values have')]
|
|
public function testDeclarationOrderIsTheOnlyOrdering(): void
|
|
{
|
|
$cases = ProtocolVersion::cases();
|
|
|
|
// Deliberately not a string sort: asserting the values collate
|
|
// chronologically would bake in the date shape the enum refuses to assume.
|
|
foreach ($cases as $index => $version) {
|
|
$this->assertTrue(
|
|
$version->isAtLeast($version),
|
|
\sprintf('%s should be at least itself.', $version->value),
|
|
);
|
|
|
|
foreach (\array_slice($cases, $index + 1) as $newer) {
|
|
$this->assertTrue(
|
|
$newer->isAtLeast($version),
|
|
\sprintf('%s is declared after %s and should compare newer.', $newer->value, $version->value),
|
|
);
|
|
$this->assertFalse(
|
|
$version->isAtLeast($newer),
|
|
\sprintf('%s should not compare newer than %s.', $version->value, $newer->value),
|
|
);
|
|
}
|
|
}
|
|
}
|
|
|
|
#[TestDox('splits the known revisions into a handshake and a modern era')]
|
|
public function testEraSplitCoversEveryCaseExactlyOnce(): void
|
|
{
|
|
$handshake = ProtocolVersion::handshakeVersions();
|
|
$modern = ProtocolVersion::modernVersions();
|
|
|
|
// A partition: every revision in exactly one era, in declaration order.
|
|
$this->assertSame(ProtocolVersion::cases(), [...$handshake, ...$modern]);
|
|
}
|
|
|
|
#[TestDox('every known revision is assigned to an era on purpose')]
|
|
public function testEveryRevisionIsClassifiedExplicitly(): void
|
|
{
|
|
// Hand-maintained on purpose: a revision appended below FIRST_MODERN_VERSION
|
|
// is classified modern by accident, and every other assertion in this file
|
|
// stays green while it vanishes from the handshake negotiation.
|
|
$eras = [
|
|
'2024-11-05' => false,
|
|
'2025-03-26' => false,
|
|
'2025-06-18' => false,
|
|
'2025-11-25' => false,
|
|
'2026-07-28' => true,
|
|
];
|
|
|
|
$this->assertSame(
|
|
array_keys($eras),
|
|
array_map(static fn (ProtocolVersion $version): string => $version->value, ProtocolVersion::cases()),
|
|
'A revision was added or removed: list it above with the era it belongs to.',
|
|
);
|
|
|
|
foreach (ProtocolVersion::cases() as $version) {
|
|
$this->assertSame(
|
|
$eras[$version->value],
|
|
$version->isModern(),
|
|
\sprintf('%s is in the wrong era; a handshake revision must be declared above %s.', $version->value, ProtocolVersion::FIRST_MODERN_VERSION->value),
|
|
);
|
|
}
|
|
}
|
|
|
|
#[TestDox('2026-07-28 opens the modern era')]
|
|
public function testModernEraStartsAt20260728(): void
|
|
{
|
|
$this->assertSame(ProtocolVersion::V2026_07_28, ProtocolVersion::FIRST_MODERN_VERSION);
|
|
|
|
$this->assertFalse(ProtocolVersion::V2025_11_25->isModern());
|
|
$this->assertTrue(ProtocolVersion::V2026_07_28->isModern());
|
|
}
|
|
|
|
#[TestDox('latestHandshake() stops short of the modern era')]
|
|
public function testLatestHandshakeStopsBeforeTheModernEra(): void
|
|
{
|
|
$this->assertSame(ProtocolVersion::V2025_11_25, ProtocolVersion::latestHandshake());
|
|
$this->assertFalse(ProtocolVersion::latestHandshake()->isModern());
|
|
}
|
|
|
|
#[TestDox('handshake versions never contain a modern revision')]
|
|
public function testHandshakeVersionsExcludeModernRevisions(): void
|
|
{
|
|
foreach (ProtocolVersion::handshakeVersions() as $version) {
|
|
$this->assertFalse($version->isModern(), \sprintf('%s leaked into the handshake era.', $version->value));
|
|
}
|
|
}
|
|
|
|
#[TestDox('compares by declaration order, not by string value')]
|
|
#[DataProvider('provideVersionComparisons')]
|
|
public function testIsAtLeast(ProtocolVersion $version, ProtocolVersion $minimum, bool $expected): void
|
|
{
|
|
$this->assertSame($expected, $version->isAtLeast($minimum));
|
|
}
|
|
|
|
/**
|
|
* @return iterable<string, array{ProtocolVersion, ProtocolVersion, bool}>
|
|
*/
|
|
public static function provideVersionComparisons(): iterable
|
|
{
|
|
yield 'equal' => [ProtocolVersion::V2025_06_18, ProtocolVersion::V2025_06_18, true];
|
|
yield 'newer' => [ProtocolVersion::V2025_11_25, ProtocolVersion::V2025_06_18, true];
|
|
yield 'older' => [ProtocolVersion::V2024_11_05, ProtocolVersion::V2025_03_26, false];
|
|
yield 'across eras' => [ProtocolVersion::V2026_07_28, ProtocolVersion::V2024_11_05, true];
|
|
yield 'oldest against newest' => [ProtocolVersion::V2024_11_05, ProtocolVersion::V2026_07_28, false];
|
|
}
|
|
|
|
#[TestDox('the header-absent default is the revision that introduced the header')]
|
|
public function testDefaultHeaderVersion(): void
|
|
{
|
|
$this->assertSame(ProtocolVersion::V2025_03_26, ProtocolVersion::DEFAULT_HEADER_VERSION);
|
|
}
|
|
|
|
#[TestDox('SEP-2106 lifts the object-only rule for structuredContent')]
|
|
public function testRequiresObjectStructuredContent(): void
|
|
{
|
|
foreach (ProtocolVersion::handshakeVersions() as $version) {
|
|
$this->assertTrue($version->requiresObjectStructuredContent(), \sprintf('%s predates SEP-2106.', $version->value));
|
|
}
|
|
|
|
$this->assertFalse(ProtocolVersion::V2026_07_28->requiresObjectStructuredContent());
|
|
}
|
|
}
|