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

Removed dublicated constraints in Format field. Improved format for field type of form

Browse Source
This commit is contained in:
Ilyas Salikhov 2017-06-04 23:24:55 +03:00
parent 25ac3dd92b
commit 46bae14425
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Parser/FormTypeParser.php
View File

@ -260,7 +260,11 @@ class FormTypeParser implements ParserInterface
} }
if (($choices = $config->getOption('choices')) && is_array($choices) && count($choices)) { if (($choices = $config->getOption('choices')) && is_array($choices) && count($choices)) {
$parameters[$name]['format'] = json_encode($choices); $choices = $config->getOption('choices_as_values') ?
array_values($choices) :
array_keys($choices);
sort($choices);
$parameters[$name]['format'] = '[' . join('|', $choices) . ']';
} elseif (($choiceList = $config->getOption('choice_list')) && $choiceList instanceof ChoiceListInterface) { } elseif (($choiceList = $config->getOption('choice_list')) && $choiceList instanceof ChoiceListInterface) {
$choices = $this->handleChoiceListValues($choiceList); $choices = $this->handleChoiceListValues($choiceList);
if (is_array($choices) && count($choices)) { if (is_array($choices) && count($choices)) {

4
Parser/ValidationParser.php
View File

@ -132,7 +132,7 @@ class ValidationParser implements ParserInterface, PostParserInterface
} }
if (isset($vparams['format'])) { if (isset($vparams['format'])) {
$vparams['format'] = join(', ', $vparams['format']); $vparams['format'] = join(', ', array_unique($vparams['format']));
} }
foreach (array('dataType', 'readonly', 'required', 'subType') as $reqprop) { foreach (array('dataType', 'readonly', 'required', 'subType') as $reqprop) {
@ -278,6 +278,8 @@ class ValidationParser implements ParserInterface, PostParserInterface
break; break;
case 'Choice': case 'Choice':
$choices = $this->getChoices($constraint, $className); $choices = $this->getChoices($constraint, $className);
sort($choices);
$format = '[' . join('|', $choices) . ']'; $format = '[' . join('|', $choices) . ']';
if ($constraint->multiple) { if ($constraint->multiple) {
$vparams['actualType'] = DataTypes::COLLECTION; $vparams['actualType'] = DataTypes::COLLECTION;