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

feat: improve invalid resource messages (#242)

Browse source
This commit is contained in:
Alexis Lefebvre 2026-02-13 18:02:43 +01:00 • committed by GitHub
commit 6e97aafb9c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 90 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Schema/Resource.php
View file

@ -68,10 +68,10 @@ class Resource implements \JsonSerializable
public readonly ?array $meta = null,
) {
if (!preg_match(self::RESOURCE_NAME_PATTERN, $name)) {
throw new InvalidArgumentException('Invalid resource name: must contain only alphanumeric characters, underscores, and hyphens.');
throw new InvalidArgumentException(\sprintf('Invalid resource name "%s": must contain only alphanumeric characters, underscores, and hyphens.', $name));
}
if (!preg_match(self::URI_PATTERN, $uri)) {
throw new InvalidArgumentException('Invalid resource URI: must be a valid URI with a scheme and optional path.');
throw new InvalidArgumentException(\sprintf('Invalid resource URI: "%s" must be a valid URI with a scheme and optional path.', $uri));
}
}

88
tests/Unit/Schema/ResourceTest.php Normal file
View file

@ -0,0 +1,88 @@
<?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;
use Mcp\Exception\InvalidArgumentException;
use Mcp\Schema\Resource;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
class ResourceTest extends TestCase
{
private const VALID_URI = 'https://example.com/list-books';
public function testConstructorValid(): void
{
$uri = self::VALID_URI;
$resource = new Resource(
uri: $uri,
name: 'list-books',
);
$this->assertInstanceOf(Resource::class, $resource);
$this->assertSame($uri, $resource->uri);
}
public function testConstructorInvalid(): void
{
$uri = '/list-books';
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Invalid resource URI: "/list-books" must be a valid URI with a scheme and optional path.');
$resource = new Resource(
uri: $uri,
name: 'list-books',
);
}
public function testFromArrayValid(): void
{
$resource = Resource::fromArray([
'uri' => self::VALID_URI,
'name' => 'list-books',
]);
$this->assertInstanceOf(Resource::class, $resource);
$this->assertSame(self::VALID_URI, $resource->uri);
$this->assertSame('list-books', $resource->name);
$this->assertNull($resource->description);
$this->assertNull($resource->meta);
}
#[DataProvider('provideInvalidResources')]
public function testFromArrayInvalid(array $input, string $expectedExceptionMessage): void
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage($expectedExceptionMessage);
Resource::fromArray($input);
}
public static function provideInvalidResources(): iterable
{
yield 'missing uri' => [[], 'Invalid or missing "uri" in Resource data.'];
yield 'missing name' => [
['uri' => self::VALID_URI],
'Invalid or missing "name" in Resource data.',
];
yield 'meta' => [
[
'uri' => self::VALID_URI,
'name' => 'list-books',
'_meta' => 'foo',
],
'Invalid "_meta" in Resource data.',
];
}
}