Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 15 additions & 9 deletions src/OpenApi/FieldCollector.php
Original file line number Diff line number Diff line change
Expand Up @@ -299,27 +299,33 @@ private function isRequired(
private function resolveEnumCases(
Property $property
): array {
if (null === ($enumClass = TypeMapper::backedEnumClass($property->type))) {
if (null === ($enumClass = TypeMapper::enumClass($property->type))) {
return [];
}

$fromKey = MetadataUtils::exists(FromKey::class, $property->meta);

// Without FromKey the documented values are the backing values, which a
// non-backed enum simply doesn't have.
if (!$fromKey && !is_subclass_of($enumClass, \BackedEnum::class)) {
return [];
}

$allowed = MetadataUtils::single(AllowedEnum::class, $property->meta);

/** @var list<\BackedEnum> $cases */
$cases = null !== $allowed ? array_values(array_filter(
$allowed->allowed,
static fn ($e) => $e instanceof \BackedEnum
)) : $enumClass::cases();
/** @var list<\UnitEnum> $cases */
$cases = null !== $allowed ? $allowed->allowed : $enumClass::cases();

if (!MetadataUtils::exists(FromKey::class, $property->meta)) {
if (!$fromKey) {
/** @var list<\BackedEnum> $cases */
return array_map(static fn (\BackedEnum $e) => $e->value, $cases);
}

if (null === ($processor = $this->resolveLabelProcessor($property))) {
return array_map(static fn (\BackedEnum $e): string => $e->name, $cases);
return array_map(static fn (\UnitEnum $e): string => $e->name, $cases);
}

return array_map(static fn (\BackedEnum $e): string => $processor->normalize($e->name), $cases);
return array_map(static fn (\UnitEnum $e): string => $processor->normalize($e->name), $cases);
}

private function resolveLabelProcessor(
Expand Down
22 changes: 22 additions & 0 deletions src/OpenApi/TypeMapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,28 @@ public static function isEnum(
return $isEnum;
}

/**
* @return class-string<\UnitEnum>|null
*/
public static function enumClass(
Type $type
): string|null {
$className = null;

$type->isSatisfiedBy(static function (Type $t) use (&$className): bool {
if ($t instanceof EnumType) {
$className = $t->getClassName();

return true;
}

return false;
});

/** @var class-string<\UnitEnum>|null $className */
return $className;
}

/**
* @return class-string<\BackedEnum>|null
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/Feature/OpenApi/EnumChoicesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,6 @@ public function testEnumChoicesUseDefaultBackingValuesAndCaseNamesWhenFromKey():
// FromKey on a pure (non-backed) enum → string schema with case names
static::assertArrayHasKey('pureEnumByKey', $byName);
static::assertSame('string', $byName['pureEnumByKey']->type);
static::assertNotEmpty($byName['pureEnumByKey']->enum);
static::assertSame(['Alpha', 'Beta'], $byName['pureEnumByKey']->enum);
}
}
Loading