Merge branch '4.4' into 5.2

* 4.4:
  [PHPDoc] Fix some union type cases

Author: chalasr

Validator/ContextualValidatorInterface.php

@@ -40,9 +40,9 @@ public function atPath(string $path);
      * If no constraint is passed, the constraint
      * {@link \Symfony\Component\Validator\Constraints\Valid} is assumed.
      *
-     * @param mixed                                              $value       The value to validate
-     * @param Constraint|Constraint[]                            $constraints The constraint(s) to validate against
-     * @param string|GroupSequence|(string|GroupSequence)[]|null $groups      The validation groups to validate. If none is given, "Default" is assumed
+     * @param mixed                                                 $value       The value to validate
+     * @param Constraint|Constraint[]                               $constraints The constraint(s) to validate against
+     * @param string|GroupSequence|array<string|GroupSequence>|null $groups      The validation groups to validate. If none is given, "Default" is assumed
      *
      * @return $this
      */
@@ -52,9 +52,9 @@ public function validate($value, $constraints = null, $groups = null);
      * Validates a property of an object against the constraints specified
      * for this property.
      *
-     * @param object                                             $object       The object
-     * @param string                                             $propertyName The name of the validated property
-     * @param string|GroupSequence|(string|GroupSequence)[]|null $groups       The validation groups to validate. If none is given, "Default" is assumed
+     * @param object                                                $object       The object
+     * @param string                                                $propertyName The name of the validated property
+     * @param string|GroupSequence|array<string|GroupSequence>|null $groups       The validation groups to validate. If none is given, "Default" is assumed
      *
      * @return $this
      */
@@ -64,10 +64,10 @@ public function validateProperty($object, string $propertyName, $groups = null);
      * Validates a value against the constraints specified for an object's
      * property.
      *
-     * @param object|string                                      $objectOrClass The object or its class name
-     * @param string                                             $propertyName  The name of the property
-     * @param mixed                                              $value         The value to validate against the property's constraints
-     * @param string|GroupSequence|(string|GroupSequence)[]|null $groups        The validation groups to validate. If none is given, "Default" is assumed
+     * @param object|string                                         $objectOrClass The object or its class name
+     * @param string                                                $propertyName  The name of the property
+     * @param mixed                                                 $value         The value to validate against the property's constraints
+     * @param string|GroupSequence|array<string|GroupSequence>|null $groups        The validation groups to validate. If none is given, "Default" is assumed
      *
      * @return $this
      */

Validator/RecursiveContextualValidator.php

@@ -271,9 +271,9 @@ public function getViolations()
     /**
      * Normalizes the given group or list of groups to an array.
      *
-     * @param string|GroupSequence|(string|GroupSequence)[] $groups The groups to normalize
+     * @param string|GroupSequence|array<string|GroupSequence> $groups The groups to normalize
      *
-     * @return (string|GroupSequence)[] A group array
+     * @return array<string|GroupSequence> A group array
      */
     protected function normalizeGroups($groups)
     {

Validator/ValidatorInterface.php

@@ -30,9 +30,9 @@ interface ValidatorInterface extends MetadataFactoryInterface
      * If no constraint is passed, the constraint
      * {@link \Symfony\Component\Validator\Constraints\Valid} is assumed.
      *
-     * @param mixed                                              $value       The value to validate
-     * @param Constraint|Constraint[]                            $constraints The constraint(s) to validate against
-     * @param string|GroupSequence|(string|GroupSequence)[]|null $groups      The validation groups to validate. If none is given, "Default" is assumed
+     * @param mixed                                                 $value       The value to validate
+     * @param Constraint|Constraint[]                               $constraints The constraint(s) to validate against
+     * @param string|GroupSequence|array<string|GroupSequence>|null $groups      The validation groups to validate. If none is given, "Default" is assumed
      *
      * @return ConstraintViolationListInterface A list of constraint violations
      *                                          If the list is empty, validation
@@ -44,9 +44,9 @@ public function validate($value, $constraints = null, $groups = null);
      * Validates a property of an object against the constraints specified
      * for this property.
      *
-     * @param object                                             $object       The object
-     * @param string                                             $propertyName The name of the validated property
-     * @param string|GroupSequence|(string|GroupSequence)[]|null $groups       The validation groups to validate. If none is given, "Default" is assumed
+     * @param object                                                $object       The object
+     * @param string                                                $propertyName The name of the validated property
+     * @param string|GroupSequence|array<string|GroupSequence>|null $groups       The validation groups to validate. If none is given, "Default" is assumed
      *
      * @return ConstraintViolationListInterface A list of constraint violations
      *                                          If the list is empty, validation
@@ -58,10 +58,10 @@ public function validateProperty($object, string $propertyName, $groups = null);
      * Validates a value against the constraints specified for an object's
      * property.
      *
-     * @param object|string                                      $objectOrClass The object or its class name
-     * @param string                                             $propertyName  The name of the property
-     * @param mixed                                              $value         The value to validate against the property's constraints
-     * @param string|GroupSequence|(string|GroupSequence)[]|null $groups        The validation groups to validate. If none is given, "Default" is assumed
+     * @param object|string                                         $objectOrClass The object or its class name
+     * @param string                                                $propertyName  The name of the property
+     * @param mixed                                                 $value         The value to validate against the property's constraints
+     * @param string|GroupSequence|array<string|GroupSequence>|null $groups        The validation groups to validate. If none is given, "Default" is assumed
      *
      * @return ConstraintViolationListInterface A list of constraint violations
      *                                          If the list is empty, validation