Skip to content

Rename schema to resource in Capability #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lvluoyue wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −8
Open

Rename schema to resource in Capability #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Capability/Registry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ public function getResources(?int $limit = null, ?string $cursor = null): Page
{
$resources = [];
foreach ($this->resources as $resourceReference) {
$resources[$resourceReference->schema->uri] = $resourceReference->schema;
$resources[$resourceReference->resource->uri] = $resourceReference->resource;
}

if (null === $limit) {
Expand Down
4 changes: 2 additions & 2 deletions src/Capability/Registry/ResourceReference.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class ResourceReference extends ElementReference
* @param Handler $handler
*/
public function __construct(
public readonly Resource $schema,
public readonly Resource $resource,
callable|array|string $handler,
bool $isManual = false,
) {
Expand Down Expand Up @@ -68,7 +68,7 @@ public function formatResult(mixed $readResult, string $uri, ?string $mimeType =
return [$readResult->resource];
}

$meta = $this->schema->meta;
$meta = $this->resource->meta;

if (\is_array($readResult)) {
if (empty($readResult)) {
Expand Down
2 changes: 1 addition & 1 deletion src/Server/Handler/Request/ReadResourceHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public function handle(Request $request, SessionInterface $session): Response|Er
$formatted = $reference->formatResult($result, $uri, $reference->resourceTemplate->mimeType);
} else {
$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));
Expand Down
4 changes: 2 additions & 2 deletions tests/Unit/Capability/Discovery/DiscoveryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ public function testDiscoversAllElementTypesCorrectlyFromFixtureFiles()

$this->assertArrayHasKey('app://info/version', $resources);
$this->assertFalse($resources['app://info/version']->isManual);
$this->assertEquals('app_version', $resources['app://info/version']->schema->name);
$this->assertEquals('text/plain', $resources['app://info/version']->schema->mimeType);
$this->assertEquals('app_version', $resources['app://info/version']->resource->name);
$this->assertEquals('text/plain', $resources['app://info/version']->resource->mimeType);

$this->assertArrayHasKey('invokable://config/status', $resources);
$this->assertFalse($resources['invokable://config/status']->isManual);
Expand Down
4 changes: 2 additions & 2 deletions tests/Unit/Capability/RegistryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ public function testGetResourceReturnsRegisteredResource(): void

$resourceRef = $this->registry->getResource('test://resource');
$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->assertFalse($resourceRef->isManual);
}
Expand Down Expand Up @@ -260,7 +260,7 @@ public function testGetResourcePrefersDirectResourceOverTemplate(): void

$resourceRef = $this->registry->getResource('test://123');
$this->assertInstanceOf(ResourceReference::class, $resourceRef);
$this->assertEquals($resource->uri, $resourceRef->schema->uri);
$this->assertEquals($resource->uri, $resourceRef->resource->uri);
}

public function testGetResourceMatchesResourceTemplate(): void
Expand Down