* [Schema][Server] Close the 2025-11-25 schema gaps and add the 2026-07-28 surface Ports the type definitions this SDK still misses outside of sampling tool use, which #409 and #420 already cover. Every addition is optional and defaults to current behaviour, so a connection negotiated on an older revision is unaffected. From 2025-11-25, elicitation gains modes. ElicitationMode splits `form` — build a form from the requested schema — from `url`, which sends the user out of band and returns only the accept/decline/cancel outcome. That is why requestedSchema becomes optional and `url` appears beside it. ClientCapabilities learns the matching sub-capabilities, where an `elicitation` naming no mode declares form, the only shape that existed before. Icon gains `theme` from the same revision, and Implementation gains the `title` BaseMetadata has carried since 2025-06-18. From 2026-07-28, schemas loosen where the revision loosens them: SEP-2106 drops the object-only restriction, so Tool::outputSchema may describe any JSON value and CallToolResult::structuredContent follows. The same revision defines three error codes (-32020 header mismatch, -32021 missing required client capability, -32022 unsupported protocol version). ProtocolVersionMiddleware switches to the last of them, so a rejected version carries the supported set as structured data the client can retry from rather than only as prose. * [Schema] Reject what the 2026-07-28 types cannot represent `Implementation::title` reached the typed constructor unchecked, so malformed wire data raised a TypeError instead of InvalidArgumentException. `ToolUseContent::input` accepted a list and serialized it as a JSON array, where the protocol requires an object. The empty array stays exempt: it is also an empty map and still emits `{}`. `ToolChoice` and `ElicitRequest` read their mode with isset(), which is false for an explicit null, so `{"mode": null}` silently became the default instead of being rejected. Both use array_key_exists() now, letting the existing type check refuse null. * [Client][Server] Advertise the implementation title through both builders `Implementation::title` could be parsed but never sent: neither `Client\Builder::setClientInfo()` nor `Server\Builder::setServerInfo()` accepted one, so every SDK user emitted null. Both gain a trailing optional `$title`. On the server it sits where the Implementation constructor already puts it, so existing positional calls keep their meaning; the client builder forwards it by name, leaving the icons and websiteUrl slots defaulted. * [Schema] Serialize every non-null structuredContent The object-only hydration guard was never that: `!is_array()` admitted `[1, 2, 3]` and `[]`, which serialize to JSON arrays, while rejecting the scalars 2026-07-28 permits. The truthiness emission gate was backwards in the same way — it dropped `[]`, `0`, `false` and `""`, yet emitted lists, strings and an empty stdClass. Hydration now accepts any JSON value, and `null` alone means absent, matching `ToolResultContent` which already carries this field that way. Which values a given revision permits is a question for version-aware serialization, which results cannot answer yet. * [Schema][Server] Make url elicitation reachable `ElicitRequest::forUrl()` built a request no SDK user could send: the only public gateway method always constructed form mode from an ElicitationSchema, and `request()` is private. `elicitUrl()` joins `elicit()`, and both funnel through one send path that hydrates the result with the request's own mode. Without that, a url-mode accept — contentless by design — threw, because ElicitResult requires content whenever the action is accept. The result carries no discriminator of its own, so the mode has to come from the request it answers. `supportsElicitationUrl()` reports whether the client named the mode, reusing the sub-capability reader the sampling checks already use. * [Schema] Add CHANGELOG entry for the 2026-07-28 surface * [Capability][Schema][Server] Carry the widened structuredContent end to end Review follow-up on the SEP-2106 widening, which stopped at the type. `ToolReference::extractStructuredContent()` returned `?array`, so a tool declaring a scalar `outputSchema` had its result dropped and logged as unsendable. It returns `mixed` now and keeps a scalar — but only from 2026-07-28 on, and only when the tool declared an outputSchema: without one the value is already carried in `content`, and advertising it twice is not an improvement. `CallToolHandler` only warned about list-shaped `structuredContent` on a self-built `CallToolResult`, so a scalar reached revisions that require an object unremarked. The check is on the shape now, not on the list case alone. `ElicitResult` retained a `content` the spec says is absent from url-mode results, leaving a malformed response indistinguishable from a valid one. `Tool::jsonSerialize()` emitted the empty root schema as `[]`, which is not a schema at all. Sub-schemas already had this treatment.
166 lines
5.6 KiB
PHP
166 lines
5.6 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;
|
|
|
|
use Mcp\Exception\InvalidArgumentException;
|
|
use Mcp\Schema\Content\TextContent;
|
|
use Mcp\Schema\Result\CallToolResult;
|
|
use Mcp\Schema\Tool;
|
|
use PHPUnit\Framework\Attributes\DataProvider;
|
|
use PHPUnit\Framework\Attributes\TestDox;
|
|
use PHPUnit\Framework\TestCase;
|
|
|
|
/**
|
|
* SEP-2106 dropped the object-only restriction on `outputSchema` and widened
|
|
* `structuredContent` to any JSON value.
|
|
*/
|
|
class NonObjectOutputSchemaTest extends TestCase
|
|
{
|
|
/**
|
|
* @return array{type: 'object', properties: array<string, mixed>, required: string[]|null}
|
|
*/
|
|
private static function validInputSchema(): array
|
|
{
|
|
return [
|
|
'type' => 'object',
|
|
'properties' => ['q' => ['type' => 'string']],
|
|
'required' => null,
|
|
];
|
|
}
|
|
|
|
/**
|
|
* @param array<string, mixed> $outputSchema
|
|
*/
|
|
#[TestDox('outputSchema accepts a non-object root')]
|
|
#[DataProvider('provideNonObjectSchemas')]
|
|
public function testAcceptsNonObjectOutputSchema(array $outputSchema): void
|
|
{
|
|
$tool = Tool::fromArray([
|
|
'name' => 'demo',
|
|
'inputSchema' => self::validInputSchema(),
|
|
'outputSchema' => $outputSchema,
|
|
]);
|
|
|
|
$this->assertSame($outputSchema, $tool->outputSchema);
|
|
}
|
|
|
|
/**
|
|
* @return iterable<string, array{array<string, mixed>}>
|
|
*/
|
|
public static function provideNonObjectSchemas(): iterable
|
|
{
|
|
yield 'array' => [['type' => 'array', 'items' => ['type' => 'string']]];
|
|
yield 'string' => [['type' => 'string']];
|
|
yield 'number' => [['type' => 'number']];
|
|
yield 'boolean' => [['type' => 'boolean']];
|
|
yield 'composition without a root type' => [['oneOf' => [['type' => 'string'], ['type' => 'number']]]];
|
|
}
|
|
|
|
#[TestDox('inputSchema still requires an object root, since tool arguments are always an object')]
|
|
public function testInputSchemaStillRequiresObjectRoot(): void
|
|
{
|
|
$this->expectException(InvalidArgumentException::class);
|
|
|
|
/* @phpstan-ignore-next-line argument.type (deliberately invalid: an array root must be rejected) */
|
|
Tool::fromArray([
|
|
'name' => 'demo',
|
|
'inputSchema' => ['type' => 'array', 'properties' => [], 'required' => null],
|
|
]);
|
|
}
|
|
|
|
#[TestDox('structuredContent holds any JSON value')]
|
|
#[DataProvider('provideStructuredValues')]
|
|
public function testStructuredContentHoldsAnyJsonValue(mixed $value): void
|
|
{
|
|
$result = new CallToolResult([new TextContent('ok')], false, $value);
|
|
|
|
$this->assertSame($value, $result->structuredContent);
|
|
}
|
|
|
|
/**
|
|
* @return iterable<string, array{mixed}>
|
|
*/
|
|
public static function provideStructuredValues(): iterable
|
|
{
|
|
yield 'list' => [[1, 2, 3]];
|
|
yield 'string' => ['hello'];
|
|
yield 'int' => [42];
|
|
yield 'float' => [1.5];
|
|
yield 'true' => [true];
|
|
yield 'zero' => [0];
|
|
yield 'false' => [false];
|
|
yield 'empty string' => [''];
|
|
yield 'empty array' => [[]];
|
|
}
|
|
|
|
/**
|
|
* `null` is the only value that means absent, so every other JSON value —
|
|
* falsy ones included — reaches the wire. This matches the sibling field on
|
|
* {@see \Mcp\Schema\Content\ToolResultContent}, which carries the same tool
|
|
* result inside a sampling turn.
|
|
*/
|
|
#[TestDox('every non-null value reaches the wire, falsy ones included')]
|
|
#[DataProvider('provideStructuredValues')]
|
|
public function testNonNullValueIsSerialized(mixed $value): void
|
|
{
|
|
$result = new CallToolResult([new TextContent('ok')], false, $value);
|
|
|
|
$serialized = $result->jsonSerialize();
|
|
|
|
$this->assertArrayHasKey('structuredContent', $serialized);
|
|
$this->assertSame($value, $serialized['structuredContent']);
|
|
}
|
|
|
|
#[TestDox('a null structuredContent is omitted entirely')]
|
|
public function testNullStructuredContentOmitted(): void
|
|
{
|
|
$result = new CallToolResult([new TextContent('ok')]);
|
|
|
|
$this->assertArrayNotHasKey('structuredContent', $result->jsonSerialize());
|
|
}
|
|
|
|
#[TestDox('round-trips any JSON structuredContent through fromArray')]
|
|
#[DataProvider('provideStructuredValues')]
|
|
public function testRoundTrip(mixed $value): void
|
|
{
|
|
$result = CallToolResult::fromArray([
|
|
'content' => [['type' => 'text', 'text' => 'ok']],
|
|
'structuredContent' => $value,
|
|
]);
|
|
|
|
$this->assertSame($value, $result->structuredContent);
|
|
}
|
|
|
|
#[TestDox('an object structuredContent still round-trips unchanged')]
|
|
public function testObjectRoundTrip(): void
|
|
{
|
|
$result = CallToolResult::fromArray([
|
|
'content' => [['type' => 'text', 'text' => 'ok']],
|
|
'structuredContent' => ['temperature' => 22.5],
|
|
]);
|
|
|
|
$this->assertSame(['temperature' => 22.5], $result->structuredContent);
|
|
$this->assertSame(['temperature' => 22.5], $result->jsonSerialize()['structuredContent']);
|
|
}
|
|
|
|
#[TestDox('the empty root schema serializes as {} rather than []')]
|
|
public function testEmptyOutputSchemaSerializesAsObject(): void
|
|
{
|
|
$tool = Tool::fromArray([
|
|
'name' => 'demo',
|
|
'inputSchema' => self::validInputSchema(),
|
|
'outputSchema' => [],
|
|
]);
|
|
|
|
$this->assertSame('{}', json_encode($tool->jsonSerialize()['outputSchema']));
|
|
}
|
|
}
|