* [Client][Docs][Schema][Server] Implement protocol version negotiation The `initialize` handler never looked at the version the client asked for: it always answered with the server's configured version (or the SDK default), so a client offering a revision the server supports could still be told to speak a different one. The spec requires echoing back a supported request and only counter-offering when the requested version cannot be honoured. Turns ProtocolVersion into the registry the other SDKs converged on (typescript-sdk's protocolEras.ts, python-sdk's mcp_types/version.py): `latestHandshake()`, `handshakeVersions()`, `modernVersions()` and ordered comparison through `isAtLeast()`. Comparison goes through declaration order rather than string collation, so an unrecognized peer string compares conservatively instead of accidentally sorting above a known revision. The one throw the enum can produce is the SDK's own LogicException, so a consumer catching `Mcp\Exception\ExceptionInterface` does not miss it. Adds 2026-07-28 as a known revision and splits the set into two eras: handshake (2025-11-25 and earlier, negotiated via `initialize`) and modern (2026-07-28+, per-request `_meta`). The lists are kept apart so a modern revision can never leak into an `initialize` exchange, which has no `initialize` at all. Serving the modern era is follow-up work; this only teaches the SDK that the revision exists and must not be mis-negotiated. Deliberately absent is any "newest revision in any era" accessor, which would hand back the one revision the handshake must never offer. Server: negotiates and stores the result on the session. A version pinned in Configuration still pins the handshake to exactly that revision. Client: validates the counter-offer and fails the handshake instead of continuing on a revision it cannot speak; records the negotiated version on the client state, readable through the new Client::getProtocolVersion(). The HTTP middleware now defaults to the handshake versions rather than every declared case, so it stops accepting a modern version the server cannot yet serve. When the header is absent it falls back to ProtocolVersion::DEFAULT_NEGOTIATED_VERSION (2025-03-26), the revision that introduced both Streamable HTTP and the header itself. The negotiation behaviour is one provideNegotiationTable() data provider whose rows are the documented table -- supported revision echoed back, unknown or malformed counter-offered, modern counter-offered -- so the docs and the suite cannot drift apart. The supported-revision rows iterate handshakeVersions() rather than a literal list, so declaring a new handshake revision extends the table automatically, and the "never answer with a modern revision" assertion runs on every row. Documented in server-builder.md (the enum registry, how the server answers a handshake, what pinning changes), transports.md (the header check) and client.md (the client's side), all linking the spec's versioning section. * [Client][Docs][Schema][Server] Warn when the configured protocol version cannot be negotiated * Log a warning instead of silently falling back when a modern revision is configured on the client or pinned on the server builder. * Document that setProtocolVersion() does not restrict the MCP-Protocol-Version header check, which validates against a fixed set. * Pin every revision's era in a test, so a new case declared past the modern boundary fails instead of dropping out of the handshake set. * Add CHANGELOG entry. * [Client][Docs][Schema][Server] Rename version fallback constant and trim comments
134 lines
5.4 KiB
PHP
134 lines
5.4 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);
|
|
}
|
|
}
|