-
-
Notifications
You must be signed in to change notification settings - Fork 9.6k
[2.7][Form] Refactored choice lists to support dynamic labels, values and attributes #12148
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
cf3ca8f
to
9aa1c85
Compare
@@ -355,3 +356,16 @@ | |||
{%- endif -%} | |||
{%- endfor -%} | |||
{%- endblock button_attributes %} | |||
|
|||
{% block attributes -%} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you can reuse this in several places like https://github.com/webmozart/symfony/blob/issue4067/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig#L320
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thought about this first, but this adds one additional function call for every single field, which is noticeable for big forms. I think the amount of duplicated code is manageable.
Lots of possibilities, great! |
/** | ||
* @author Bernhard Schussek <[email protected]> | ||
*/ | ||
class StringCastable |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
class seems unused
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks, removed
I fear the |
/** | ||
* {@inheritdoc} | ||
*/ | ||
public function loadValuesForChoices(array $entities, $value = null) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since you use inheritdoc I guess the parameter names must stay the same. So $choices
instead of $entities
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
added explicit doc blocks
I haven't looked at the code yet (I probably won't have time for that today, but the PR is waiting for the end of the 2.6 stabilization phase anyway so it is not an issue), but the description looks great. Btw, the flipping of choices makes the grouping much more logical than previously: labels are always given in keys, instead of being the keys for groups and the values for leafs. |
@@ -33,19 +36,19 @@ | |||
protected $registry; | |||
|
|||
/** | |||
* @var array | |||
* @var DefaultChoiceListFactory |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ChoiceListFactoryInterface
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks
The feature and code is beautiful 👍 |
@Tobion thanks :) |
I removed the deprecation note from "flip_choices" now. People are indeed encouraged to use it. |
ref #9738 |
Why do I always click the wrong button.. |
This should be fixed here: #10551 |
👍 |
If you add a Currently the |
Definitively one of my most wanted feature |
👍 |
1 similar comment
👍 |
I think the
makes people think they will get flipped, but then it would remove the actualy values as they cannot be represented as array key. |
👍 for what @EmmanuelVella mentioned. Callables for labels also would be great! |
// Due to a bug in OptionsResolver, the choices haven't been | ||
// validated yet at this point. Remove the if statement once that | ||
// bug is resolved | ||
if (!$options['choice_loader'] instanceof ChoiceLoaderInterface) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This problem in OptionsResolver is fixed with the rewritten implementation since 2.6. So when we set the correct dependency, we can also remove this condition.
Nice feature @webmozart! How about Concrete case: I have a <option value="{{ id }}" data-surname="{{ surname }}">{{ name }}</option> Could be possible with your PR? Thanks. |
Any chance to see this feature on 2.7? |
That's exactly what i need!! 👍 |
… and attribute generation
Replaced by #12148. |
@webmozart You mean #14050 I guess ;) |
Oops, thanks @stloyd :) |
…l, value, index and attribute generation (webmozart) This PR was merged into the 2.7 branch. Discussion ---------- [Form] Refactored choice lists to support dynamic label, value, index and attribute generation This is a rebase of #12148 on the 2.7 branch. | Q | A | ------------- | --- | Bug fix? | no | New feature? | yes | BC breaks? | yes | Deprecations? | yes | Tests pass? | yes | Fixed tickets | #4067, #5494, #3836, #8658, #12148 | License | MIT | Doc PR | TODO I implemented the additional options "choice_label", "choice_name", "choice_value", "choice_attr", "group_by" and "choices_as_values" for ChoiceType. Additionally the "preferred_choices" option was updated to accept callables and property paths. The "choices_as_values" option will be removed in Symfony 3.0, where the choices will be passed in the values of the "choices" option by default. The reason for that is that, right now, choices are limited to strings and integers (i.e. valid array keys). When we flip the array, we remove that limitation. Since choice labels are always strings, we can also always use them as array keys: ```php // Not possible currently, but possible with "flip_choices" $builder->add('attending', 'choice', array( 'choices' => array( 'Yes' => true, 'No' => false, 'Maybe' => null, ), 'choices_as_values' => true, )); ``` All the features described here obviously also apply to subtypes of "choice", such as "entity". **choice_label** Returns the label for each choice. Can be a callable (which receives the choice as first and the key of the "choices" array as second argument) or a property path. If `null`, the keys of the "choices" array are used as labels. ```php // callable $builder->add('attending', 'choice', array( 'choices' => array( 'yes' => true, 'no' => false, 'maybe' => null, ), 'choices_as_values' => true, 'choice_label' => function ($choice, $key) { return 'form.choice.'.$key; }, )); // property path $builder->add('attending', 'choice', array( 'choices' => array( Status::getInstance(Status::YES), Status::getInstance(Status::NO), Status::getInstance(Status::MAYBE), ), 'choices_as_values' => true, 'choice_label' => 'displayName', )); ``` **choice_name** Returns the form name for each choice. That name is used as name of the checkbox/radio form for this choice. It is also used as index of the choice views in the template. Can be a callable (like for "choice_label") or a property path. The generated names must be valid form names, i.e. contain alpha-numeric symbols, underscores, hyphens and colons only. They must start with an alpha-numeric symbol or an underscore. If `null`, an incrementing integer is used as name. ```php // callable $builder->add('attending', 'choice', array( 'choices' => array( 'Yes' => true, 'No' => false, 'Maybe' => null, ), 'choices_as_values' => true, 'choice_name' => function ($choice, $key) { // use the labels as names return strtolower($key); }, )); // property path $builder->add('attending', 'choice', array( 'choices' => array( 'Yes' => Status::getInstance(Status::YES), 'No' => Status::getInstance(Status::NO), 'Maybe' => Status::getInstance(Status::MAYBE), ), 'choices_as_values' => true, 'choice_name' => 'value', )); ``` **choice_value** Returns the string value for each choice. This value is displayed in the "value" attributes and submitted in the POST/PUT requests. Can be a callable (like for "choice_label") or a property path. If `null`, an incrementing integer is used as value. ```php // callable $builder->add('attending', 'choice', array( 'choices' => array( 'Yes' => true, 'No' => false, 'Maybe' => null, ), 'choices_as_values' => true, 'choice_value' => function ($choice, $key) { if (null === $choice) { return 'null'; } if (true === $choice) { return 'true'; } return 'false'; }, )); // property path $builder->add('attending', 'choice', array( 'choices' => array( 'Yes' => Status::getInstance(Status::YES), 'No' => Status::getInstance(Status::NO), 'Maybe' => Status::getInstance(Status::MAYBE), ), 'choices_as_values' => true, 'choice_value' => 'value', )); ``` **choice_attr** Returns the additional HTML attributes for choices. Can be an array, a callable (like for "choice_label") or a property path. If an array, the key of the "choices" array must be used as keys. ```php // array $builder->add('attending', 'choice', array( 'choices' => array( 'Yes' => true, 'No' => false, 'Maybe' => null, ), 'choices_as_values' => true, 'choice_attr' => array( 'Maybe' => array('class' => 'greyed-out'), ), )); // callable $builder->add('attending', 'choice', array( 'choices' => array( 'Yes' => true, 'No' => false, 'Maybe' => null, ), 'choices_as_values' => true, 'choice_attr' => function ($choice, $key) { if (null === $choice) { return array('class' => 'greyed-out'); } }, )); // property path $builder->add('attending', 'choice', array( 'choices' => array( 'Yes' => Status::getInstance(Status::YES), 'No' => Status::getInstance(Status::NO), 'Maybe' => Status::getInstance(Status::MAYBE), ), 'choices_as_values' => true, 'choice_value' => 'htmlAttributes', )); ``` **group_by** Returns the grouping used for the choices. Can be an array/Traversable, a callable (like for "choice_label") or a property path. The return values of the callable/property path are used as group labels. If `null` is returned, a choice is not grouped. If `null`, the structure of the "choices" array is used to construct the groups. ```php // default $builder->add('attending', 'choice', array( 'choices' => array( 'Decided' => array( 'Yes' => true, 'No' => false, ), 'Undecided' => array( 'Maybe' => null, ), ), 'choices_as_values' => true, )); // callable $builder->add('attending', 'choice', array( 'choices' => array( 'Yes' => true, 'No' => false, 'Maybe' => null, ), 'choices_as_values' => true, 'group_by' => function ($choice, $key) { if (null === $choice) { return 'Undecided'; } return 'Decided'; }, )); // property path $builder->add('attending', 'choice', array( 'choices' => array( 'Yes' => Status::getInstance(Status::YES), 'No' => Status::getInstance(Status::NO), 'Maybe' => Status::getInstance(Status::MAYBE), ), 'choices_as_values' => true, 'group_by' => 'type', )); ``` **preferred_choices** Returns the preferred choices. Can be an array/Traversable, a callable (like for "choice_label") or a property path. ```php // array $builder->add('attending', 'choice', array( 'choices' => array( 'Yes' => true, 'No' => false, 'Maybe' => null, ), 'choices_as_values' => true, 'preferred_choices' => array(true), )); // callable $builder->add('attending', 'choice', array( 'choices' => array( 'Yes' => true, 'No' => false, 'Maybe' => null, ), 'choices_as_values' => true, 'preferred_choices' => function ($choice, $key) { return true === $choice; }, )); // property path $builder->add('attending', 'choice', array( 'choices' => array( 'Yes' => Status::getInstance(Status::YES), 'No' => Status::getInstance(Status::NO), 'Maybe' => Status::getInstance(Status::MAYBE), ), 'choices_as_values' => true, 'preferred_choices' => 'preferred', )); ``` **Technical Changes** To properly implement all this, the old `ChoiceListInterface` class was deprecated and replaced by a new, slimmer one. The creation of choice views is now separated from choice lists. Hence a lot of logic is not executed anymore when processing (but not displaying) a form. Internally, a `ChoiceListFactoryInterface` implementation is used to construct choice lists and choice views. Two decorators exist for this class: * `CachingFactoryDecorator`: caches choice lists/views so that multiple fields displaying the same choices (e.g. in collection fields) use the same choice list/view * `PropertyAccessDecorator`: adds support for property paths to a factory **BC Breaks** The option "choice_list" of ChoiceType now contains a `Symfony\Component\Form\ChoiceList\ChoiceListInterface` instance, which is a super-type of the deprecated `ChoiceListInterface`. **Todos** - [ ] Adapt CHANGELOGs - [ ] Adapt UPGRADE files - [ ] symfony/symfony-docs issue/PR Commits ------- 94d18e9 [Form] Fixed CS 7e0960d [Form] Fixed failing layout tests 1d89922 [Form] Fixed tests using legacy functionality d6179c8 [Form] Fixed PR comments 26eba76 [Form] Fixed regression: Choices are compared by their values if a value callback is given a289deb [Form] Fixed new ArrayChoiceList to compare choices by their values, if enabled e6739bf [DoctrineBridge] DoctrineType now respects the "query_builder" option when caching the choice loader 3846b37 [DoctrineBridge] Fixed: don't cache choice lists if query builders are constructed dynamically 03efce1 [Form] Refactored choice lists to support dynamic label, value, index and attribute generation
This PR didn't make it in time anymore for the 2.6 feature freeze. It will be merged as soon as development for 2.7 officially starts.
I implemented the additional options "choice_label", "choice_name", "choice_value", "choice_attr", "group_by" and "flip_choices" for ChoiceType. Additionally the "preferred_choices" option was updated to accept callables and property paths.
The "flip_choices" option will be removed in Symfony 3.0, where the "choices" will be flipped by default. The reason for that is that, right now, choices are limited to strings and integers (i.e. valid array keys). When we flip the array, we remove that limitation. Since choice labels are always strings, we can also always use them as array keys:
All the features described here obviously also apply to subtypes of "choice", such as "entity".
choice_label
Returns the label for each choice. Can be a callable (which receives the choice as first and the key of the "choices" array as second argument) or a property path.
If
null
, the keys of the "choices" array are used as labels.choice_name
Returns the form name for each choice. That name is used as name of the checkbox/radio form for this choice. It is also used as index of the choice views in the template. Can be a callable (like for "choice_label") or a property path.
The generated names must be valid form names, i.e. contain alpha-numeric symbols, underscores, hyphens and colons only. They must start with an alpha-numeric symbol or an underscore.
If
null
, an incrementing integer is used as name.choice_value
Returns the string value for each choice. This value is displayed in the "value" attributes and submitted in the POST/PUT requests. Can be a callable (like for "choice_label") or a property path.
If
null
, an incrementing integer is used as value.choice_attr
Returns the additional HTML attributes for choices. Can be an array, a callable (like for "choice_label") or a property path.
If an array, the key of the "choices" array must be used as keys.
group_by
Returns the grouping used for the choices. Can be an array/Traversable, a callable (like for "choice_label") or a property path.
The return values of the callable/property path are used as group labels. If
null
is returned, a choice is not grouped.If
null
, the structure of the "choices" array is used to construct the groups.preferred_choices
Returns the preferred choices. Can be an array/Traversable, a callable (like for "choice_label") or a property path.
Technical Changes
To properly implement all this, the old
ChoiceListInterface
class was deprecated and replaced by a new, slimmer one. The creation of choice views is now separated from choice lists. Hence a lot of logic is not executed anymore when processing (but not displaying) a form.Internally, a
ChoiceListFactoryInterface
implementation is used to construct choice lists and choice views. Two decorators exist for this class:CachingFactoryDecorator
: caches choice lists/views so that multiple fields displaying the same choices (e.g. in collection fields) use the same choice list/viewPropertyAccessDecorator
: adds support for property paths to a factoryBC Breaks
The option "choice_list" of ChoiceType now contains a
Symfony\Component\Form\ChoiceList\ChoiceListInterface
instance, which is a super-type of the deprecatedChoiceListInterface
.Todos
To be completed after the release of 2.6: