[Form] Fix handling of empty_data's \Closure value in Date/Time form types #34123
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xabbuh
requested changes
Oct 26, 2019
fa43849 to
8a5798a
Compare
|
@xabbuh done, thanks! |
src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
Outdated
Show resolved
Hide resolved
8a5798a to
4939f0e
Compare
xabbuh
reviewed
Nov 14, 2019
| @@ -126,7 +136,9 @@ public function buildForm(FormBuilderInterface $builder, array $options) | |||
| 'invalid_message_parameters', | |||
| ])); | |||
|
|
|||
| if (isset($emptyData['time'])) { | |||
| if ($emptyData instanceof \Closure) { | |||
There was a problem hiding this comment.
What about doing the same as what you did in the DateType then?
if ($emptyData instanceof \Closure) {
$lazyEmptyData = static function ($option) use ($emptyData) {
return static function (FormInterface $form) use ($emptyData, $option) {
$emptyData = $emptyData($form->getParent());
return isset($emptyData[$option]) ? $emptyData[$option] : '';
};
};
$dateOptions['empty_data'] = $lazyEmptyData('date');
} else {
if (isset($emptyData['date'])) {
$dateOptions['empty_data'] = $emptyData['date'];
}
if (isset($emptyData['time'])) {
$timeOptions['empty_data'] = $emptyData['time'];
}
}There was a problem hiding this comment.
To do that the $timeOptions initialization should be moved before the first empty data definition.
There was a problem hiding this comment.
I can see there are conflicting comments from Nicolas and Christian, so maybe we should always set $lazyEmptyData base on the instance of once, then test if $lazyEmptyData is null to define the options.
HeahDude
approved these changes
Nov 23, 2019
fabpot
approved these changes
Feb 3, 2020
xabbuh
approved these changes
Feb 3, 2020
|
Thank you @yceruto. |
fabpot
added a commit
that referenced
this pull request
Feb 3, 2020
…/Time form types (yceruto) This PR was merged into the 3.4 branch. Discussion ---------- [Form] Fix handling of empty_data's \Closure value in Date/Time form types | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #33188 | License | MIT | Doc PR | - Basically this would solve the posibility to pass a `\Closure` to the `empty_data` option for Date/Time form types. > https://symfony.com/doc/current/reference/forms/types/form.html#empty-data > If a form is compound, you can set empty_data as an array, object or **closure**. See the [How to Configure empty Data](https://symfony.com/doc/current/form/use_empty_data.html) for a Form Class article for more details about these options. Also related to #29182 Commits ------- 4939f0e Fix handling of empty_data's \Closure value in Date/Time form types
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Basically this would solve the posibility to pass a
\Closureto theempty_dataoption for Date/Time form types.Also related to #29182