Merge branch '5.4' into 6.2

* 5.4:
  Fix Doctrine deprecations
  [Validator] Remove internal from methods on non-internal interfaces
  [PhpUnitBridge] Fix support for the NO_COLOR env var

Author: nicolas-grekas

Context/ExecutionContextInterface.php

@@ -117,96 +117,75 @@ public function getValidator(): ValidatorInterface;
     public function getObject(): ?object;
 
     /**
-     * Sets the currently validated value.
+     * Warning: Should not be called by user code, to be used by the validator engine only.
      *
      * @param object|null $object       The currently validated object
      * @param string      $propertyPath The property path to the current value
-     *
-     * @internal Used by the validator engine. Should not be called by user
-     *           code.
      */
     public function setNode(mixed $value, ?object $object, MetadataInterface $metadata = null, string $propertyPath);
 
     /**
-     * Sets the currently validated group.
+     * Warning: Should not be called by user code, to be used by the validator engine only.
      *
      * @param string|null $group The validated group
-     *
-     * @internal Used by the validator engine. Should not be called by user
-     *           code.
      */
     public function setGroup(?string $group);
 
     /**
-     * Sets the currently validated constraint.
-     *
-     * @internal Used by the validator engine. Should not be called by user
-     *           code.
+     * Warning: Should not be called by user code, to be used by the validator engine only.
      */
     public function setConstraint(Constraint $constraint);
 
     /**
-     * Marks an object as validated in a specific validation group.
+     * Warning: Should not be called by user code, to be used by the validator engine only.
      *
      * @param string $cacheKey  The hash of the object
      * @param string $groupHash The group's name or hash, if it is group
      *                          sequence
-     *
-     * @internal Used by the validator engine. Should not be called by user
-     *           code.
      */
     public function markGroupAsValidated(string $cacheKey, string $groupHash);
 
     /**
-     * Returns whether an object was validated in a specific validation group.
+     * Warning: Should not be called by user code, to be used by the validator engine only.
      *
      * @param string $cacheKey  The hash of the object
      * @param string $groupHash The group's name or hash, if it is group
      *                          sequence
      *
-     * @internal Used by the validator engine
      */
     public function isGroupValidated(string $cacheKey, string $groupHash): bool;
 
     /**
-     * Marks a constraint as validated for an object.
+     * Warning: Should not be called by user code, to be used by the validator engine only.
      *
      * @param string $cacheKey       The hash of the object
      * @param string $constraintHash The hash of the constraint
-     *
-     * @internal Used by the validator engine. Should not be called by user
-     *           code.
      */
     public function markConstraintAsValidated(string $cacheKey, string $constraintHash);
 
     /**
-     * Returns whether a constraint was validated for an object.
+     * Warning: Should not be called by user code, to be used by the validator engine only.
      *
      * @param string $cacheKey       The hash of the object
      * @param string $constraintHash The hash of the constraint
      *
-     * @internal Used by the validator engine
      */
     public function isConstraintValidated(string $cacheKey, string $constraintHash): bool;
 
     /**
-     * Marks that an object was initialized.
+     * Warning: Should not be called by user code, to be used by the validator engine only.
      *
      * @param string $cacheKey The hash of the object
      *
-     * @internal Used by the validator engine. Should not be called by user
-     *           code.
-     *
      * @see ObjectInitializerInterface
      */
     public function markObjectAsInitialized(string $cacheKey);
 
     /**
-     * Returns whether an object was initialized.
+     * Warning: Should not be called by user code, to be used by the validator engine only.
      *
      * @param string $cacheKey The hash of the object
      *
-     * @internal Used by the validator engine
      *
      * @see ObjectInitializerInterface
      */

Mapping/ClassMetadata.php

@@ -340,16 +340,17 @@ public function mergeConstraints(self $source)
                     $constraint->addImplicitGroupName($this->getDefaultGroup());
                 }
 
-                $this->addPropertyMetadata($member);
-
                 if ($member instanceof MemberMetadata && !$member->isPrivate($this->name)) {
                     $property = $member->getPropertyName();
+                    $this->members[$property] = [$member];
 
-                    if ($member instanceof PropertyMetadata && !isset($this->properties[$property])) {
+                    if ($member instanceof PropertyMetadata) {
                         $this->properties[$property] = $member;
-                    } elseif ($member instanceof GetterMetadata && !isset($this->getters[$property])) {
+                    } elseif ($member instanceof GetterMetadata) {
                         $this->getters[$property] = $member;
                     }
+                } else {
+                    $this->addPropertyMetadata($member);
                 }
             }
         }

Mapping/Loader/AnnotationLoader.php

@@ -92,27 +92,49 @@ public function loadClassMetadata(ClassMetadata $metadata): bool
      */
     private function getAnnotations(object $reflection): iterable
     {
+        $dedup = [];
+
         foreach ($reflection->getAttributes(GroupSequence::class) as $attribute) {
+            $dedup[] = $attribute->newInstance();
             yield $attribute->newInstance();
         }
         foreach ($reflection->getAttributes(GroupSequenceProvider::class) as $attribute) {
+            $dedup[] = $attribute->newInstance();
             yield $attribute->newInstance();
         }
         foreach ($reflection->getAttributes(Constraint::class, \ReflectionAttribute::IS_INSTANCEOF) as $attribute) {
+            $dedup[] = $attribute->newInstance();
             yield $attribute->newInstance();
         }
         if (!$this->reader) {
             return;
         }
 
+        $annotations = [];
+
         if ($reflection instanceof \ReflectionClass) {
-            yield from $this->reader->getClassAnnotations($reflection);
+            $annotations = $this->reader->getClassAnnotations($reflection);
         }
         if ($reflection instanceof \ReflectionMethod) {
-            yield from $this->reader->getMethodAnnotations($reflection);
+            $annotations = $this->reader->getMethodAnnotations($reflection);
         }
         if ($reflection instanceof \ReflectionProperty) {
-            yield from $this->reader->getPropertyAnnotations($reflection);
+            $annotations = $this->reader->getPropertyAnnotations($reflection);
+        }
+
+        foreach ($dedup as $annotation) {
+            if ($annotation instanceof Constraint) {
+                $annotation->groups; // trigger initialization of the "groups" property
+            }
+        }
+
+        foreach ($annotations as $annotation) {
+            if ($annotation instanceof Constraint) {
+                $annotation->groups; // trigger initialization of the "groups" property
+            }
+            if (!\in_array($annotation, $dedup, false)) {
+                yield $annotation;
+            }
         }
     }
 }