diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor DefaultChoiceListFactory

Browse Source
This commit is contained in:
Valentin 2019-04-07 11:13:09 +02:00
parent 65b46a532c
commit 77424c8557
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
View File

@ -68,7 +68,7 @@ class DefaultChoiceListFactory implements ChoiceListFactoryInterface
// choice is not added to any group
if (\is_callable($groupBy)) {
foreach ($choices as $value => $choice) {
self::addChoiceViewGroupedBy(
self::addChoiceViewsGroupedByCallable(
$groupBy,
$choice,
(string) $value,
@ -81,9 +81,23 @@ class DefaultChoiceListFactory implements ChoiceListFactoryInterface
$otherViews
);
}
// Remove empty group views that may have been created by
// addChoiceViewsGroupedByCallable()
foreach ($preferredViews as $key => $view) {
if ($view instanceof ChoiceGroupView && 0 === \count($view->choices)) {
unset($preferredViews[$key]);
}
}
foreach ($otherViews as $key => $view) {
if ($view instanceof ChoiceGroupView && 0 === \count($view->choices)) {
unset($otherViews[$key]);
}
}
} else {
// Otherwise use the original structure of the choices
self::addChoiceViewsGroupedBy(
self::addChoiceViewsFromStructuredValues(
$list->getStructuredValues(),
$label,
$choices,
@ -96,20 +110,6 @@ class DefaultChoiceListFactory implements ChoiceListFactoryInterface
);
}
// Remove any empty group view that may have been created by
// addChoiceViewGroupedBy()
foreach ($preferredViews as $key => $view) {
if ($view instanceof ChoiceGroupView && 0 === \count($view->choices)) {
unset($preferredViews[$key]);
}
}
foreach ($otherViews as $key => $view) {
if ($view instanceof ChoiceGroupView && 0 === \count($view->choices)) {
unset($otherViews[$key]);
}
}
return new ChoiceListView($otherViews, $preferredViews);
}
@ -148,9 +148,9 @@ class DefaultChoiceListFactory implements ChoiceListFactoryInterface
}
}
private static function addChoiceViewsGroupedBy($groupBy, $label, $choices, $keys, &$index, $attr, $isPreferred, &$preferredViews, &$otherViews)
private static function addChoiceViewsFromStructuredValues($values, $label, $choices, $keys, &$index, $attr, $isPreferred, &$preferredViews, &$otherViews)
{
foreach ($groupBy as $key => $value) {
foreach ($values as $key => $value) {
if (null === $value) {
continue;
}
@ -160,7 +160,7 @@ class DefaultChoiceListFactory implements ChoiceListFactoryInterface
$preferredViewsForGroup = [];
$otherViewsForGroup = [];
self::addChoiceViewsGroupedBy(
self::addChoiceViewsFromStructuredValues(
$value,
$label,
$choices,
@ -198,7 +198,7 @@ class DefaultChoiceListFactory implements ChoiceListFactoryInterface
}
}
private static function addChoiceViewGroupedBy($groupBy, $choice, $value, $label, $keys, &$index, $attr, $isPreferred, &$preferredViews, &$otherViews)
private static function addChoiceViewsGroupedByCallable($groupBy, $choice, $value, $label, $keys, &$index, $attr, $isPreferred, &$preferredViews, &$otherViews)
{
$groupLabel = $groupBy($choice, $keys[$value], $value);