Merge pull request #1034 from nelmio/GuilhemN-patch-1

[FosRestDescriber] Don't override parameter type if already specified
This commit is contained in:
Guilhem Niot 2017-07-11 18:41:54 +01:00 committed by GitHub
commit 7e46cc8899

View File

@ -44,8 +44,10 @@ final class FosRestDescriber implements RouteDescriberInterface
$parameter->setRequired(!$annotation->nullable && $annotation->strict);
$parameter->setAllowEmptyValue($annotation->nullable && $annotation->allowBlank);
$parameter->setType($annotation->map ? 'array' : 'string');
$parameter->setDefault($annotation->getDefault());
if (null === $parameter->getType()) {
$parameter->setType($annotation->map ? 'array' : 'string');
}
if (null === $parameter->getDescription()) {
$parameter->setDescription($annotation->description);
}