Merge branch '4.4' into 5.2

chalasr · chalasr · commit e4130f18600a · 2021-04-08T12:27:02.000+02:00
* 4.4:
  [PHPDoc] Fix some union type cases
diff --git a/Extension/Validator/Constraints/FormValidator.php b/Extension/Validator/Constraints/FormValidator.php
@@ -203,7 +203,7 @@ public function validate($form, Constraint $formConstraint)
     /**
      * Returns the validation groups of the given form.
      *
-     * @return string|GroupSequence|(string|GroupSequence)[] The validation groups
+     * @return string|GroupSequence|array<string|GroupSequence> The validation groups
      */
     private function getValidationGroups(FormInterface $form)
     {
@@ -242,9 +242,9 @@ private function getValidationGroups(FormInterface $form)
     /**
      * Post-processes the validation groups option for a given form.
      *
-     * @param string|GroupSequence|(string|GroupSequence)[]|callable $groups The validation groups
+     * @param string|GroupSequence|array<string|GroupSequence>|callable $groups The validation groups
      *
-     * @return GroupSequence|(string|GroupSequence)[] The validation groups
+     * @return GroupSequence|array<string|GroupSequence> The validation groups
      */
     private static function resolveValidationGroups($groups, FormInterface $form)
     {

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ public function validate($form, Constraint $formConstraint)`
`203`	`203`	`/**`
`204`	`204`	`* Returns the validation groups of the given form.`
`205`	`205`	`*`
`206`		`- * @return string\|GroupSequence\|(string\|GroupSequence)[] The validation groups`
	`206`	`+ * @return string\|GroupSequence\|array<string\|GroupSequence> The validation groups`
`207`	`207`	`*/`
`208`	`208`	`private function getValidationGroups(FormInterface $form)`
`209`	`209`	`{`
`@@ -242,9 +242,9 @@ private function getValidationGroups(FormInterface $form)`
`242`	`242`	`/**`
`243`	`243`	`* Post-processes the validation groups option for a given form.`
`244`	`244`	`*`
`245`		`- * @param string\|GroupSequence\|(string\|GroupSequence)[]\|callable $groups The validation groups`
	`245`	`+ * @param string\|GroupSequence\|array<string\|GroupSequence>\|callable $groups The validation groups`
`246`	`246`	`*`
`247`		`- * @return GroupSequence\|(string\|GroupSequence)[] The validation groups`
	`247`	`+ * @return GroupSequence\|array<string\|GroupSequence> The validation groups`
`248`	`248`	`*/`
`249`	`249`	`private static function resolveValidationGroups($groups, FormInterface $form)`
`250`	`250`	`{`