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

fix: Cannot pass null to nullable enum parameters (#299)

Browse source 
* nullable enum value

* fix tests
This commit is contained in:
SBNTT 2026-05-08 10:15:14 +02:00 • committed by GitHub
commit 06917f6af6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Capability/Discovery/SchemaGenerator.php
View file

@ -374,7 +374,8 @@ final class SchemaGenerator implements SchemaGeneratorInterface
if ($jsonBackingType) {
if (isset($paramSchema['type']) && \is_array($paramSchema['type']) && \in_array('null', $paramSchema['type'])) {
$paramSchema['type'] = ['null', $jsonBackingType];
$paramSchema['type'] = [$jsonBackingType, 'null'];
$paramSchema['enum'][] = null;
} else {
$paramSchema['type'] = $jsonBackingType;
}
@ -383,7 +384,8 @@ final class SchemaGenerator implements SchemaGeneratorInterface
// Non-backed enum - use names as enum values
$paramSchema['enum'] = array_column($enumClass::cases(), 'name');
if (isset($paramSchema['type']) && \is_array($paramSchema['type']) && \in_array('null', $paramSchema['type'])) {
$paramSchema['type'] = ['null', 'string'];
$paramSchema['type'] = ['string', 'null'];
$paramSchema['enum'][] = null;
} else {
$paramSchema['type'] = 'string';
}

2
tests/Unit/Capability/Discovery/SchemaGeneratorTest.php
View file

@ -197,7 +197,7 @@ final class SchemaGeneratorTest extends TestCase
$this->assertEquals(['type' => 'string', 'description' => 'Backed string enum', 'enum' => ['A', 'B']], $schema['properties']['stringEnum']);
$this->assertEquals(['type' => 'integer', 'description' => 'Backed int enum', 'enum' => [1, 2]], $schema['properties']['intEnum']);
$this->assertEquals(['type' => 'string', 'description' => 'Unit enum', 'enum' => ['Yes', 'No']], $schema['properties']['unitEnum']);
$this->assertEquals(['type' => ['null', 'string'], 'enum' => ['A', 'B'], 'default' => null], $schema['properties']['nullableEnum']);
$this->assertEquals(['type' => ['string', 'null'], 'enum' => ['A', 'B', null], 'default' => null], $schema['properties']['nullableEnum']);
$this->assertEquals(['type' => 'integer', 'enum' => [1, 2], 'default' => 1], $schema['properties']['enumWithDefault']);
$this->assertEqualsCanonicalizing(['stringEnum', 'intEnum', 'unitEnum'], $schema['required']);
}