10000 [Form] Fix inconsistencies by vudaltsov · Pull Request #32935 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Form] Fix inconsistencies #32935

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 5, 2019
Merged

[Form] Fix inconsistencies #32935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[Form] Fix inconsistencies
  • Loading branch information
@vudaltsov @nicolas-grekas
vudaltsov authored and nicolas-grekas committed Aug 5, 2019
commit 360711ce4e3b83251e7fe9dac958dc4f4246c0b6
14 changes: 7 additions & 7 deletions src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,13 @@ public function getValuesForChoices(array $choices)
/**
* Flattens an array into the given output variables.
*
* @param array $choices The array to flatten
* @param callable $value The callable for generating choice values
* @param array $choicesByValues The flattened choices indexed by the
* corresponding values
* @param array $keysByValues The original keys indexed by the
* corresponding values
* @param array $structuredValues The values indexed by the original keys
* @param array $choices The array to flatten
* @param callable $value The callable for generating choice values
* @param array|null $choicesByValues The flattened choices indexed by the
* corresponding values
* @param array|null $keysByValues The original keys indexed by the
* corresponding values
* @param array|null $structuredValues The values indexed by the original keys
*
* @internal
*/
Expand Down
8 changes: 2 additions & 6 deletions src/Symfony/Component/Form/ChoiceList/Factory/ChoiceListFactoryInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ interface ChoiceListFactoryInterface
* Null may be passed when the choice list contains the empty value.
*
* @param iterable $choices The choices
* @param callable|null $value The callable generating the choice
* values
* @param callable|null $value The callable generating the choice values
*
* @return ChoiceListInterface The choice list
*/
Expand All @@ -46,9 +45,7 @@ public function createListFromChoices($choices, $value = null);
* The callable receives the choice as only argument.
* Null may be passed when the choice list contains the empty value.
*
* @param ChoiceLoaderInterface $loader The choice loader
* @param callable|null $value The callable generating the choice
* values
* @param callable|null $value The callable generating the choice values
*
* @return ChoiceListInterface The choice list
*/
Expand Down Expand Up @@ -80,7 +77,6 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, $value = nul
* match the keys of the choices. The values should be arrays of HTML
* attributes that should be added to the respective choice.
*
* @param ChoiceListInterface $list The choice list
* @param array|callable|null $preferredChoices The preferred choices
* @param callable|null $label The callable generating the
* choice labels
Expand Down
8 changes: 4 additions & 4 deletions src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ class ChoiceView
/**
* Creates a new choice view.
*
* @param mixed $data The original choice
* @param string $value The view representation of the choice
* @param string $label The label displayed to humans
* @param array $attr Additional attributes for the HTML tag
* @param mixed $data The original choice
* @param string $value The view representation of the choice
* @param string|false $label The label displayed to humans; pass false to discard the label
* @param array $attr Additional attributes for the HTML tag
*/
public function __construct($data, $value, $label, array $attr = [])
{
Expand Down
0