Skip to content

Commit 2c41eaa

Browse files
committed
Rename schema to resource in Capability and related classes
1 parent 2f29b1d commit 2c41eaa

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

src/Capability/Registry.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public function getResources(?int $limit = null, ?string $cursor = null): Page
234234
{
235235
$resources = [];
236236
foreach ($this->resources as $resourceReference) {
237-
$resources[$resourceReference->schema->uri] = $resourceReference->schema;
237+
$resources[$resourceReference->resource->uri] = $resourceReference->resource;
238238
}
239239

240240
if (null === $limit) {

src/Capability/Registry/ResourceReference.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class ResourceReference extends ElementReference
2929
* @param Handler $handler
3030
*/
3131
public function __construct(
32-
public readonly Resource $schema,
32+
public readonly Resource $resource,
3333
callable|array|string $handler,
3434
bool $isManual = false,
3535
) {
@@ -68,7 +68,7 @@ public function formatResult(mixed $readResult, string $uri, ?string $mimeType =
6868
return [$readResult->resource];
6969
}
7070

71-
$meta = $this->schema->meta;
71+
$meta = $this->resource->meta;
7272

7373
if (\is_array($readResult)) {
7474
if (empty($readResult)) {

src/Server/Handler/Request/ReadResourceHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public function handle(Request $request, SessionInterface $session): Response|Er
7272
$formatted = $reference->formatResult($result, $uri, $reference->resourceTemplate->mimeType);
7373
} else {
7474
$result = $this->referenceHandler->handle($reference, $arguments);
75-
$formatted = $reference->formatResult($result, $uri, $reference->schema->mimeType);
75+
$formatted = $reference->formatResult($result, $uri, $reference->resource->mimeType);
7676
}
7777

7878
return new Response($request->getId(), new ReadResourceResult($formatted));

tests/Unit/Capability/Discovery/DiscoveryTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ public function testDiscoversAllElementTypesCorrectlyFromFixtureFiles()
6565

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

7171
$this->assertArrayHasKey('invokable://config/status', $resources);
7272
$this->assertFalse($resources['invokable://config/status']->isManual);

tests/Unit/Capability/RegistryTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public function testGetResourceReturnsRegisteredResource(): void
167167

168168
$resourceRef = $this->registry->getResource('test://resource');
169169
$this->assertInstanceOf(ResourceReference::class, $resourceRef);
170-
$this->assertEquals($resource->uri, $resourceRef->schema->uri);
170+
$this->assertEquals($resource->uri, $resourceRef->resource->uri);
171171
$this->assertEquals($handler, $resourceRef->handler);
172172
$this->assertFalse($resourceRef->isManual);
173173
}
@@ -260,7 +260,7 @@ public function testGetResourcePrefersDirectResourceOverTemplate(): void
260260

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

266266
public function testGetResourceMatchesResourceTemplate(): void

0 commit comments

Comments
 (0)