Skip to content

Commit 96b52c0

Browse files
Merge branch '4.2'
* 4.2: [Routing] fix trailing slash redirections involving a trailing var [EventDispatcher] Revers event tracing order [Security] Prefer clone over unserialize(serialize()) for user refreshment [Console] OutputFormatter: move strtolower to createStyleFromString Adjust tests to work in the armhf architecture. Fixes #29281. Vietnamese translations improvement [Form] Fixed FormErrorIterator class phpdoc Renamed test controller from Controller to TestController so it doesn't show up in the IDE autocomplete. Don't use he in docs when its not needed EventSubscriberInterface isn't a man Fix undefined variable in cache ArrayTrait fixed public directory of web server and assets install when configured in composer.json
2 parents 8337184 + dd7940a commit 96b52c0

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

Extension/Core/Type/ChoiceType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ private function addSubForm(FormBuilderInterface $builder, string $name, ChoiceV
378378
if ($options['multiple']) {
379379
$choiceType = __NAMESPACE__.'\CheckboxType';
380380
// The user can check 0 or more checkboxes. If required
381-
// is true, he is required to check all of them.
381+
// is true, they are required to check all of them.
382382
$choiceOpts['required'] = false;
383383
} else {
384384
$choiceType = __NAMESPACE__.'\RadioType';

FormErrorIterator.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@
1919
/**
2020
* Iterates over the errors of a form.
2121
*
22-
* Optionally, this class supports recursive iteration. In order to iterate
23-
* recursively, set the constructor argument $deep to true. Now each element
24-
* returned by the iterator is either an instance of {@link FormError} or of
25-
* {@link FormErrorIterator}, in case the errors belong to a sub-form.
22+
* This class supports recursive iteration. In order to iterate recursively,
23+
* pass a structure of {@link FormError} and {@link FormErrorIterator} objects
24+
* to the $errors constructor argument.
2625
*
2726
* You can also wrap the iterator into a {@link \RecursiveIteratorIterator} to
2827
* flatten the recursive structure into a flat list of errors.

0 commit comments

Comments
 (0)