modelcontextprotocol/php-sdk
Watch
1
0
Fork
You've already forked php-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Rename schema to resource in Capability and related classes (#217)

Browse source
This commit is contained in:
落月 2026-01-12 04:52:04 +08:00 • committed by GitHub
commit 1de4ea933f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -7,6 +7,7 @@ All notable changes to `mcp/sdk` will be documented in this file.
* Add output schema support to MCP tools * Add output schema support to MCP tools
* Add validation of the input parameters given to a Tool. * Add validation of the input parameters given to a Tool.
* Rename `Mcp\Capability\Registry\ResourceReference::$schema` to `Mcp\Capability\Registry\ResourceReference::$resource`.
0.2.2 0.2.2
----- -----

2
src/Capability/Registry.php
View file

@ -234,7 +234,7 @@ final class Registry implements RegistryInterface
{ {
$resources = []; $resources = [];
foreach ($this->resources as $resourceReference) { foreach ($this->resources as $resourceReference) {
$resources[$resourceReference->schema->uri] = $resourceReference->schema; $resources[$resourceReference->resource->uri] = $resourceReference->resource;
} }
if (null === $limit) { if (null === $limit) {

4
src/Capability/Registry/ResourceReference.php
View file

@ -29,7 +29,7 @@ class ResourceReference extends ElementReference
* @param Handler $handler * @param Handler $handler
*/ */
public function __construct( public function __construct(
public readonly Resource $schema, public readonly Resource $resource,
callable|array|string $handler, callable|array|string $handler,
bool $isManual = false, bool $isManual = false,
) { ) {
@ -68,7 +68,7 @@ class ResourceReference extends ElementReference
return [$readResult->resource]; return [$readResult->resource];
} }
$meta = $this->schema->meta; $meta = $this->resource->meta;
if (\is_array($readResult)) { if (\is_array($readResult)) {
if (empty($readResult)) { if (empty($readResult)) {

2
src/Server/Handler/Request/ReadResourceHandler.php
View file

@ -72,7 +72,7 @@ final class ReadResourceHandler implements RequestHandlerInterface
$formatted = $reference->formatResult($result, $uri, $reference->resourceTemplate->mimeType); $formatted = $reference->formatResult($result, $uri, $reference->resourceTemplate->mimeType);
} else { } else {
$result = $this->referenceHandler->handle($reference, $arguments); $result = $this->referenceHandler->handle($reference, $arguments);
$formatted = $reference->formatResult($result, $uri, $reference->schema->mimeType); $formatted = $reference->formatResult($result, $uri, $reference->resource->mimeType);
} }
return new Response($request->getId(), new ReadResourceResult($formatted)); return new Response($request->getId(), new ReadResourceResult($formatted));

4
tests/Unit/Capability/Discovery/DiscoveryTest.php
View file

@ -65,8 +65,8 @@ class DiscoveryTest extends TestCase
$this->assertArrayHasKey('app://info/version', $resources); $this->assertArrayHasKey('app://info/version', $resources);
$this->assertFalse($resources['app://info/version']->isManual); $this->assertFalse($resources['app://info/version']->isManual);
$this->assertEquals('app_version', $resources['app://info/version']->schema->name); $this->assertEquals('app_version', $resources['app://info/version']->resource->name);
$this->assertEquals('text/plain', $resources['app://info/version']->schema->mimeType); $this->assertEquals('text/plain', $resources['app://info/version']->resource->mimeType);
$this->assertArrayHasKey('invokable://config/status', $resources); $this->assertArrayHasKey('invokable://config/status', $resources);
$this->assertFalse($resources['invokable://config/status']->isManual); $this->assertFalse($resources['invokable://config/status']->isManual);

4
tests/Unit/Capability/RegistryTest.php
View file

@ -167,7 +167,7 @@ class RegistryTest extends TestCase
$resourceRef = $this->registry->getResource('test://resource'); $resourceRef = $this->registry->getResource('test://resource');
$this->assertInstanceOf(ResourceReference::class, $resourceRef); $this->assertInstanceOf(ResourceReference::class, $resourceRef);
$this->assertEquals($resource->uri, $resourceRef->schema->uri); $this->assertEquals($resource->uri, $resourceRef->resource->uri);
$this->assertEquals($handler, $resourceRef->handler); $this->assertEquals($handler, $resourceRef->handler);
$this->assertFalse($resourceRef->isManual); $this->assertFalse($resourceRef->isManual);
} }
@ -260,7 +260,7 @@ class RegistryTest extends TestCase
$resourceRef = $this->registry->getResource('test://123'); $resourceRef = $this->registry->getResource('test://123');
$this->assertInstanceOf(ResourceReference::class, $resourceRef); $this->assertInstanceOf(ResourceReference::class, $resourceRef);
$this->assertEquals($resource->uri, $resourceRef->schema->uri); $this->assertEquals($resource->uri, $resourceRef->resource->uri);
} }
public function testGetResourceMatchesResourceTemplate(): void public function testGetResourceMatchesResourceTemplate(): void