Skip to content

Commit 540602c

Browse files
committed
Merge branch '2.8' into 3.4
* 2.8: improve docblocks around group sequences [WebProfilerBundle] added a note in the README [Filesystem] Skip tests on readable file when run with root user [FWBundle] Fix an error in WebTestCase::createClient's PHPDoc [HttpFoundation][Security] forward locale and format to subrequests [Console] Send the right exit code to console.terminate listeners Caching missed templates on cache warmup
2 parents ec24f68 + 984cda4 commit 540602c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Extension/Validator/Constraints/FormValidator.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public function validate($form, Constraint $constraint)
137137
/**
138138
* Returns the validation groups of the given form.
139139
*
140-
* @return array The validation groups
140+
* @return string|GroupSequence|(string|GroupSequence)[] The validation groups
141141
*/
142142
private static function getValidationGroups(FormInterface $form)
143143
{
@@ -172,10 +172,10 @@ private static function getValidationGroups(FormInterface $form)
172172
/**
173173
* Post-processes the validation groups option for a given form.
174174
*
175-
* @param array|callable $groups The validation groups
176-
* @param FormInterface $form The validated form
175+
* @param string|GroupSequence|(string|GroupSequence)[]|callable $groups The validation groups
176+
* @param FormInterface $form The validated form
177177
*
178-
* @return array The validation groups
178+
* @return (string|GroupSequence)[] The validation groups
179179
*/
180180
private static function resolveValidationGroups($groups, FormInterface $form)
181181
{

0 commit comments

Comments
 (0)