mirror of
https://github.com/retailcrm/NelmioApiDocBundle.git
synced 2025-03-12 10:36:09 +03:00
Merge pull request #1506 from nelmio/GuilhemN-patch-1
Fix map support of FOSRestBundle
This commit is contained in:
commit
101648bb8f
@ -40,7 +40,8 @@ final class FosRestDescriber implements RouteDescriberInterface
|
||||
foreach ($this->getOperations($api, $route) as $operation) {
|
||||
foreach ($annotations as $annotation) {
|
||||
if ($annotation instanceof QueryParam) {
|
||||
$parameter = $operation->getParameters()->get($annotation->getName(), 'query');
|
||||
$name = $annotation->getName().($annotation->map ? '[]' : '');
|
||||
$parameter = $operation->getParameters()->get($name, 'query');
|
||||
$parameter->setAllowEmptyValue($annotation->nullable && $annotation->allowBlank);
|
||||
|
||||
$parameter->setRequired(!$annotation->nullable && $annotation->strict);
|
||||
@ -58,13 +59,22 @@ final class FosRestDescriber implements RouteDescriberInterface
|
||||
}
|
||||
|
||||
$parameter->setDefault($annotation->getDefault());
|
||||
if (null === $parameter->getType()) {
|
||||
$parameter->setType($annotation->map ? 'array' : 'string');
|
||||
if (null !== $parameter->getType()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (null === $parameter->getDescription()) {
|
||||
$parameter->setDescription($annotation->description);
|
||||
}
|
||||
|
||||
if ($annotation->map) {
|
||||
$parameter->setType('array');
|
||||
$parameter->setCollectionFormat('multi');
|
||||
$parameter = $parameter->getItems();
|
||||
}
|
||||
|
||||
$parameter->setType('string');
|
||||
|
||||
$pattern = $this->getPattern($annotation->requirements);
|
||||
if (null !== $pattern) {
|
||||
$parameter->setPattern($pattern);
|
||||
|
Loading…
x
Reference in New Issue
Block a user