Skip to content

Capture extensions on the discriminator #2

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

Merged
ChiragAgg5k merged 1 commit into from
Aug 14, 2026
Merged

Capture extensions on the discriminator #2

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
6 changes: 5 additions & 1 deletion src/Model/Schema/Discriminator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@

final readonly class Discriminator
{
/** @param array<string, string> $mapping */
/**
* @param array<string, string> $mapping
* @param array<string, mixed> $extensions
*/
public function __construct(
public string $propertyName,
public array $mapping = [],
public array $extensions = [],
) {}
}
6 changes: 5 additions & 1 deletion src/Parser/Schema/Reader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,10 @@ private function discriminator(array $data): ?Discriminator
$mapping[(string) $name] = $reference;
}

return new Discriminator(Value::requiredString($value, 'propertyName', 'schema/discriminator'), $mapping);
return new Discriminator(
Value::requiredString($value, 'propertyName', 'schema/discriminator'),
$mapping,
Value::extensions($value),
);
}
}
46 changes: 46 additions & 0 deletions tests/Schema/ReaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,52 @@ public function test_discriminator_is_read_from_both_the_string_and_object_forms
self::assertSame(['cat' => '#/components/schemas/Cat'], $fromObject->discriminator?->mapping);
}

public function test_discriminator_captures_extensions(): void
{
$reader = $this->reader(Version::V3_0);

$schema = $reader->read([
'oneOf' => [],
'discriminator' => [
'propertyName' => 'type',
'mapping' => ['string' => '#/components/schemas/Text'],
'x-mapping' => [
'#/components/schemas/Email' => ['type' => 'string', 'format' => 'email'],
'#/components/schemas/Text' => ['type' => 'string'],
],
'x-propertyNames' => ['type', 'format'],
],
], '#/x');

self::assertInstanceOf(CompositeSchema::class, $schema);
self::assertSame([
'x-mapping' => [
'#/components/schemas/Email' => ['type' => 'string', 'format' => 'email'],
'#/components/schemas/Text' => ['type' => 'string'],
],
'x-propertyNames' => ['type', 'format'],
], $schema->discriminator?->extensions);

self::assertSame('type', $schema->discriminator?->propertyName);
self::assertSame(['string' => '#/components/schemas/Text'], $schema->discriminator?->mapping);
}

public function test_discriminator_extensions_default_to_empty(): void
{
$reader = $this->reader(Version::V3_0);

$fromString = $reader->read(['oneOf' => [], 'discriminator' => 'kind'], '#/x');
self::assertInstanceOf(CompositeSchema::class, $fromString);
self::assertSame([], $fromString->discriminator?->extensions);

$fromObject = $reader->read([
'oneOf' => [],
'discriminator' => ['propertyName' => 'kind'],
], '#/x');
self::assertInstanceOf(CompositeSchema::class, $fromObject);
self::assertSame([], $fromObject->discriminator?->extensions);
}

public function test_object_and_array_types_are_implied_from_their_keywords(): void
{
$reader = $this->reader(Version::V3_0);
Expand Down
Loading