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] Fix _meta guard key in Request and Notification jsonSerialize() (#485)

Browse source
This commit is contained in:
Christopher Hertel 2026-09-05 01:18:54 +02:00 • committed by GitHub
commit 1bd7895b5f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 79 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Schema/JsonRpc/Notification.php
View file

@ -74,7 +74,7 @@ abstract class Notification implements HasMethodInterface, MessageInterface
$array['params'] = $params;
}
if (null !== $this->meta && !isset($params['meta'])) {
if (null !== $this->meta && !isset($params['_meta'])) {
$array['params']['_meta'] = $this->meta;
}

2
src/Schema/JsonRpc/Request.php
View file

@ -122,7 +122,7 @@ abstract class Request implements HasMethodInterface, MessageInterface
$array['params'] = $params;
}
if (null !== $this->meta && !isset($params['meta'])) {
if (null !== $this->meta && !isset($params['_meta'])) {
$array['params']['_meta'] = $this->meta;
}

40
tests/Unit/Schema/JsonRpc/NotificationTest.php
View file

@ -53,4 +53,44 @@ final class NotificationTest extends TestCase
$this->assertSame($expectedMeta, $notification->jsonSerialize());
}
public function testMetaDoesNotOverrideMetaFromParams(): void
{
$notificationImplementation = new class extends Notification {
public static function getMethod(): string
{
return 'notifications/dummy';
}
public static function fromParams(?array $params): self
{
return new self();
}
protected function getParams(): array
{
return [
'_meta' => ['key' => 'from-params'],
];
}
};
$notification = $notificationImplementation::fromArray([
'jsonrpc' => '2.0',
'method' => 'notifications/dummy',
'params' => [
'_meta' => ['key' => 'from-meta'],
],
]);
$expected = [
'jsonrpc' => '2.0',
'method' => 'notifications/dummy',
'params' => [
'_meta' => ['key' => 'from-params'],
],
];
$this->assertSame($expected, $notification->jsonSerialize());
}
}

37
tests/Unit/Schema/JsonRpc/RequestTest.php
View file

@ -55,4 +55,41 @@ final class RequestTest extends TestCase
$this->assertSame($expectedMeta, $notification->jsonSerialize());
}
public function testMetaDoesNotOverrideMetaFromParams(): void
{
$requestImplementation = new class extends Request {
public static function getMethod(): string
{
return 'foo/bar';
}
public static function fromParams(?array $params): static
{
return new self();
}
protected function getParams(): array
{
return [
'_meta' => ['key' => 'from-params'],
];
}
};
$request = $requestImplementation::fromParams(null)
->withId('12345')
->withMeta(['key' => 'from-meta']);
$expected = [
'jsonrpc' => '2.0',
'id' => '12345',
'method' => 'foo/bar',
'params' => [
'_meta' => ['key' => 'from-params'],
],
];
$this->assertSame($expected, $request->jsonSerialize());
}
}