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
20 changes: 19 additions & 1 deletion src/JsonSchema/DefinitionNameFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function __construct(private ?array $distinctFormats = null)
public function create(string $className, string $format = 'json', ?string $inputOrOutputClass = null, ?Operation $operation = null, array $serializerContext = []): string
{
if ($operation) {
$prefix = $operation->getShortName();
$prefix = $this->createPrefixFromOperation($operation);
}

if (!isset($prefix)) {
Expand Down Expand Up @@ -82,6 +82,24 @@ private function encodeDefinitionName(string $name): string
return preg_replace('/[^a-zA-Z0-9.\-_]/', '.', $name);
}

private function createPrefixFromOperation(Operation $operation): ?string
{
$name = $operation->getShortName();

if (!isset($this->prefixCache[$name])) {
$this->prefixCache[$name] = $operation->getClass();

return $name;
}

if ($this->prefixCache[$name] === $operation->getClass()) {
return $name;
}

// This will fallback to using `createPrefixFromClass`
return null;
}

private function createPrefixFromClass(string $fullyQualifiedClassName, int $namespaceParts = 1): string
{
$parts = explode('\\', $fullyQualifiedClassName);
Expand Down
20 changes: 20 additions & 0 deletions src/JsonSchema/Tests/DefinitionNameFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,24 @@ public function testCreateDifferentPrefixesForClassesWithTheSameShortName(): voi
$definitionNameFactory->create(Fixtures\DefinitionNameFactory\NamespaceA\Module\DummyClass::class, 'jsonhal')
);
}

public function testCreateDifferentPrefixesForClassesWithTheSameOperationShortName(): void
{
$definitionNameFactory = new DefinitionNameFactory();

self::assertEquals(
'DummyClass.jsonapi',
$definitionNameFactory->create(Fixtures\DefinitionNameFactory\NamespaceA\Module\DummyClass::class, 'jsonapi', null, new Get(class: Fixtures\DefinitionNameFactory\NamespaceA\Module\DummyClass::class, shortName: 'DummyClass'))
);

self::assertEquals(
'Module.DummyClass.jsonapi',
$definitionNameFactory->create(Fixtures\DefinitionNameFactory\NamespaceB\Module\DummyClass::class, 'jsonapi', null, new Get(class: Fixtures\DefinitionNameFactory\NamespaceB\Module\DummyClass::class, shortName: 'DummyClass'))
);

self::assertEquals(
'NamespaceC.Module.DummyClass.jsonapi',
$definitionNameFactory->create(Fixtures\DefinitionNameFactory\NamespaceC\Module\DummyClass::class, 'jsonapi', null, new Get(class: Fixtures\DefinitionNameFactory\NamespaceC\Module\DummyClass::class, shortName: 'DummyClass'))
);
}
}
Loading