RetailCRM-Mirror/NelmioApiDocBundle
1
0
Fork 0
mirror of https://github.com/retailcrm/NelmioApiDocBundle.git synced 2025-02-09 02:59:27 +03:00
Code Issues Projects Releases Wiki Activity

Apply #1863 to 3.x branch (#1888)

Browse Source 
This also fixes #1877
This commit is contained in:
Daniel Gelling 2021-11-04 00:07:01 +01:00 committed by GitHub
parent aa18c6c83b
commit c0b57fd371
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Model/ModelRegistry.php
View File

@ -126,8 +126,8 @@ final class ModelRegistry
private function getTypeShortName(Type $type): string
{
if (null !== $type->getCollectionValueType()) {
return $this->getTypeShortName($type->getCollectionValueType()).'[]';
if (null !== $collectionType = $this->getCollectionValueType($type)) {
return $this->getTypeShortName($collectionType).'[]';
}
if (Type::BUILTIN_TYPE_OBJECT === $type->getBuiltinType()) {
@ -144,8 +144,8 @@ final class ModelRegistry
if (Type::BUILTIN_TYPE_OBJECT === $type->getBuiltinType()) {
return $type->getClassName();
} elseif ($type->isCollection()) {
if (null !== $type->getCollectionValueType()) {
return $this->typeToString($type->getCollectionValueType()).'[]';
if (null !== $collectionType = $this->getCollectionValueType($type)) {
return $this->typeToString($collectionType).'[]';
} else {
return 'mixed[]';
}
@ -153,4 +153,14 @@ final class ModelRegistry
return $type->getBuiltinType();
}
}
private function getCollectionValueType(Type $type): ?Type
{
// BC layer, this condition should be removed after removing support for symfony < 5.3
if (!method_exists($type, 'getCollectionValueTypes')) {
return $type->getCollectionValueType();
}
return $type->getCollectionValueTypes()[0] ?? null;
}
}

5
PropertyDescriber/ArrayPropertyDescriber.php
View File

@ -31,7 +31,10 @@ class ArrayPropertyDescriber implements PropertyDescriberInterface, ModelRegistr
public function describe(Type $type, Schema $property, array $groups = null)
{
$type = $type->getCollectionValueType();
// BC layer for symfony < 5.3
$type = method_exists($type, 'getCollectionValueTypes') ?
($type->getCollectionValueTypes()[0] ?? null) :
$type->getCollectionValueType();
if (null === $type) {
throw new UndocumentedArrayItemsException();
}

14
PropertyDescriber/ObjectPropertyDescriber.php
View File

@ -23,7 +23,19 @@ class ObjectPropertyDescriber implements PropertyDescriberInterface, ModelRegist
public function describe(Type $type, Schema $property, array $groups = null)
{
$type = new Type($type->getBuiltinType(), false, $type->getClassName(), $type->isCollection(), $type->getCollectionKeyType(), $type->getCollectionValueType()); // ignore nullable field
$type = new Type(
$type->getBuiltinType(),
false,
$type->getClassName(),
$type->isCollection(),
method_exists($type, 'getCollectionKeyTypes') ?
($type->getCollectionKeyTypes()[0] ?? null) :
$type->getCollectionKeyType(),
// BC layer for symfony < 5.3
method_exists($type, 'getCollectionValueTypes') ?
($type->getCollectionValueTypes()[0] ?? null) :
$type->getCollectionValueType()
); // ignore nullable field
$property->setRef(
$this->modelRegistry->register(new Model($type, $groups))