[Form] Fix inconsistencies
This commit is contained in:
parent
926246ba72
commit
360711ce4e
@ -172,13 +172,13 @@ class ArrayChoiceList implements ChoiceListInterface
|
|||||||
/**
|
/**
|
||||||
* Flattens an array into the given output variables.
|
* Flattens an array into the given output variables.
|
||||||
*
|
*
|
||||||
* @param array $choices The array to flatten
|
* @param array $choices The array to flatten
|
||||||
* @param callable $value The callable for generating choice values
|
* @param callable $value The callable for generating choice values
|
||||||
* @param array $choicesByValues The flattened choices indexed by the
|
* @param array|null $choicesByValues The flattened choices indexed by the
|
||||||
* corresponding values
|
* corresponding values
|
||||||
* @param array $keysByValues The original keys indexed by the
|
* @param array|null $keysByValues The original keys indexed by the
|
||||||
* corresponding values
|
* corresponding values
|
||||||
* @param array $structuredValues The values indexed by the original keys
|
* @param array|null $structuredValues The values indexed by the original keys
|
||||||
*
|
*
|
||||||
* @internal
|
* @internal
|
||||||
*/
|
*/
|
||||||
|
@ -32,8 +32,7 @@ interface ChoiceListFactoryInterface
|
|||||||
* Null may be passed when the choice list contains the empty value.
|
* Null may be passed when the choice list contains the empty value.
|
||||||
*
|
*
|
||||||
* @param iterable $choices The choices
|
* @param iterable $choices The choices
|
||||||
* @param callable|null $value The callable generating the choice
|
* @param callable|null $value The callable generating the choice values
|
||||||
* values
|
|
||||||
*
|
*
|
||||||
* @return ChoiceListInterface The choice list
|
* @return ChoiceListInterface The choice list
|
||||||
*/
|
*/
|
||||||
@ -46,9 +45,7 @@ interface ChoiceListFactoryInterface
|
|||||||
* The callable receives the choice as only argument.
|
* The callable receives the choice as only argument.
|
||||||
* Null may be passed when the choice list contains the empty value.
|
* 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
|
* @return ChoiceListInterface The choice list
|
||||||
*/
|
*/
|
||||||
@ -80,7 +77,6 @@ interface ChoiceListFactoryInterface
|
|||||||
* match the keys of the choices. The values should be arrays of HTML
|
* match the keys of the choices. The values should be arrays of HTML
|
||||||
* attributes that should be added to the respective choice.
|
* attributes that should be added to the respective choice.
|
||||||
*
|
*
|
||||||
* @param ChoiceListInterface $list The choice list
|
|
||||||
* @param array|callable|null $preferredChoices The preferred choices
|
* @param array|callable|null $preferredChoices The preferred choices
|
||||||
* @param callable|null $label The callable generating the
|
* @param callable|null $label The callable generating the
|
||||||
* choice labels
|
* choice labels
|
||||||
|
@ -30,10 +30,10 @@ class ChoiceView
|
|||||||
/**
|
/**
|
||||||
* Creates a new choice view.
|
* Creates a new choice view.
|
||||||
*
|
*
|
||||||
* @param mixed $data The original choice
|
* @param mixed $data The original choice
|
||||||
* @param string $value The view representation of the choice
|
* @param string $value The view representation of the choice
|
||||||
* @param string $label The label displayed to humans
|
* @param string|false $label The label displayed to humans; pass false to discard the label
|
||||||
* @param array $attr Additional attributes for the HTML tag
|
* @param array $attr Additional attributes for the HTML tag
|
||||||
*/
|
*/
|
||||||
public function __construct($data, $value, $label, array $attr = [])
|
public function __construct($data, $value, $label, array $attr = [])
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user