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 Implementation::fromArray rejecting falsy-but-valid name/version (#393)

Browse source 
* [Schema] Fix Implementation::fromArray rejecting falsy-but-valid name/version

`empty()` treats the string "0" as empty, so a valid clientInfo/serverInfo
with `"version": "0"` (or `"name": "0"`) was rejected with an
InvalidArgumentException. During initialize this aborted request parsing and
surfaced as a misleading "A valid session id is REQUIRED" error.

Replace the `empty()` guards with explicit isset/is_string/empty-string checks
so genuinely missing, non-string, and empty values are still rejected while
"0" is accepted. Adds ImplementationTest covering the regression and the
existing validation paths.

Fixes #392

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

* [Schema] Suppress PHPStan argument.type on invalid-input tests

---------

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Dev 2026-07-15 05:41:51 +08:00 • committed by GitHub
commit 206aa9da52
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 179 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Schema/Implementation.php
View file

@ -45,10 +45,10 @@ class Implementation implements \JsonSerializable
*/
public static function fromArray(array $data): self
{
if (empty($data['name']) || !\is_string($data['name'])) {
if (!isset($data['name']) || !\is_string($data['name']) || '' === $data['name']) {
throw new InvalidArgumentException('Invalid or missing "name" in Implementation data.');
}
if (empty($data['version']) || !\is_string($data['version'])) {
if (!isset($data['version']) || !\is_string($data['version']) || '' === $data['version']) {
throw new InvalidArgumentException('Invalid or missing "version" in Implementation data.');
}

177
tests/Unit/Schema/ImplementationTest.php Normal file
View file

@ -0,0 +1,177 @@
<?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\Implementation;
use PHPUnit\Framework\TestCase;
final class ImplementationTest extends TestCase
{
public function testConstructorDefaults(): void
{
$implementation = new Implementation();
$this->assertSame('app', $implementation->name);
$this->assertSame('dev', $implementation->version);
$this->assertNull($implementation->description);
$this->assertNull($implementation->icons);
$this->assertNull($implementation->websiteUrl);
}
public function testFromArrayWithMinimalData(): void
{
$implementation = Implementation::fromArray([
'name' => 'my-client',
'version' => '1.2.3',
]);
$this->assertSame('my-client', $implementation->name);
$this->assertSame('1.2.3', $implementation->version);
$this->assertNull($implementation->description);
$this->assertNull($implementation->icons);
$this->assertNull($implementation->websiteUrl);
}
public function testFromArrayWithAllFields(): void
{
$implementation = Implementation::fromArray([
'name' => 'my-client',
'version' => '1.2.3',
'description' => 'A test client',
'icons' => [['src' => 'https://example.com/icon.png']],
'websiteUrl' => 'https://example.com',
]);
$this->assertSame('my-client', $implementation->name);
$this->assertSame('1.2.3', $implementation->version);
$this->assertSame('A test client', $implementation->description);
$this->assertIsArray($implementation->icons);
$this->assertCount(1, $implementation->icons);
$this->assertSame('https://example.com', $implementation->websiteUrl);
}
/**
* Regression test for #392: falsy-but-valid version strings such as "0"
* were rejected because empty('0') === true.
*/
public function testFromArrayAcceptsZeroStringVersion(): void
{
$implementation = Implementation::fromArray([
'name' => 'my-client',
'version' => '0',
]);
$this->assertSame('0', $implementation->version);
}
/**
* Regression test for #392: a name of "0" is a valid string and must be accepted.
*/
public function testFromArrayAcceptsZeroStringName(): void
{
$implementation = Implementation::fromArray([
'name' => '0',
'version' => '1.0.0',
]);
$this->assertSame('0', $implementation->name);
}
public function testFromArrayThrowsOnMissingName(): void
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Invalid or missing "name" in Implementation data.');
/* @phpstan-ignore argument.type */
Implementation::fromArray(['version' => '1.0.0']);
}
public function testFromArrayThrowsOnEmptyName(): void
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Invalid or missing "name" in Implementation data.');
Implementation::fromArray(['name' => '', 'version' => '1.0.0']);
}
public function testFromArrayThrowsOnNonStringName(): void
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Invalid or missing "name" in Implementation data.');
/* @phpstan-ignore argument.type */
Implementation::fromArray(['name' => 123, 'version' => '1.0.0']);
}
public function testFromArrayThrowsOnMissingVersion(): void
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Invalid or missing "version" in Implementation data.');
/* @phpstan-ignore argument.type */
Implementation::fromArray(['name' => 'my-client']);
}
public function testFromArrayThrowsOnEmptyVersion(): void
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Invalid or missing "version" in Implementation data.');
Implementation::fromArray(['name' => 'my-client', 'version' => '']);
}
public function testFromArrayThrowsOnNonStringVersion(): void
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Invalid or missing "version" in Implementation data.');
/* @phpstan-ignore argument.type */
Implementation::fromArray(['name' => 'my-client', 'version' => 1]);
}
public function testFromArrayThrowsOnNonArrayIcons(): void
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Invalid "icons" in Implementation data; expected an array.');
/* @phpstan-ignore argument.type */
Implementation::fromArray(['name' => 'my-client', 'version' => '1.0.0', 'icons' => 'nope']);
}
public function testJsonSerializeRoundTrip(): void
{
$implementation = Implementation::fromArray([
'name' => 'my-client',
'version' => '0',
'description' => 'A test client',
'websiteUrl' => 'https://example.com',
]);
$this->assertSame([
'name' => 'my-client',
'version' => '0',
'description' => 'A test client',
'websiteUrl' => 'https://example.com',
], $implementation->jsonSerialize());
}
public function testJsonSerializeOmitsNullOptionalFields(): void
{
$implementation = new Implementation('my-client', '1.0.0');
$this->assertSame([
'name' => 'my-client',
'version' => '1.0.0',
], $implementation->jsonSerialize());
}
}