diff --git a/src/Bridge/Symfony/Identifier/Normalizer/UuidNormalizer.php b/src/Bridge/Symfony/Identifier/Normalizer/UuidNormalizer.php index 932879501e0..34a597125ee 100644 --- a/src/Bridge/Symfony/Identifier/Normalizer/UuidNormalizer.php +++ b/src/Bridge/Symfony/Identifier/Normalizer/UuidNormalizer.php @@ -24,6 +24,8 @@ final class UuidNormalizer implements DenormalizerInterface { /** * {@inheritdoc} + * + * @return mixed */ public function denormalize($data, $class, $format = null, array $context = []) { @@ -36,6 +38,8 @@ public function denormalize($data, $class, $format = null, array $context = []) /** * {@inheritdoc} + * + * @return bool */ public function supportsDenormalization($data, $type, $format = null) { diff --git a/src/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaOneOfRestriction.php b/src/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaOneOfRestriction.php index 7472ddec22c..badbbcf7a25 100644 --- a/src/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaOneOfRestriction.php +++ b/src/Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaOneOfRestriction.php @@ -42,7 +42,7 @@ public function __construct(iterable $restrictionsMetadata = []) */ public function create(Constraint $constraint, PropertyMetadata $propertyMetadata): array { - $oneOfConstraints = $constraint->getNestedContraints(); + $oneOfConstraints = method_exists($constraint, 'getNestedContraints') ? $constraint->getNestedContraints() : $constraint->constraints; $oneOfRestrictions = []; foreach ($oneOfConstraints as $oneOfConstraint) { diff --git a/src/Bridge/Symfony/Validator/Metadata/Property/ValidatorPropertyMetadataFactory.php b/src/Bridge/Symfony/Validator/Metadata/Property/ValidatorPropertyMetadataFactory.php index 0d288062ef8..b5953ace1bf 100644 --- a/src/Bridge/Symfony/Validator/Metadata/Property/ValidatorPropertyMetadataFactory.php +++ b/src/Bridge/Symfony/Validator/Metadata/Property/ValidatorPropertyMetadataFactory.php @@ -19,6 +19,7 @@ use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraints\Bic; use Symfony\Component\Validator\Constraints\CardScheme; +use Symfony\Component\Validator\Constraints\Compound; use Symfony\Component\Validator\Constraints\Currency; use Symfony\Component\Validator\Constraints\Date; use Symfony\Component\Validator\Constraints\DateTime; @@ -171,8 +172,8 @@ private function getPropertyConstraints( } foreach ($validatorPropertyMetadata->findConstraints($validationGroup) as $propertyConstraint) { - if ($propertyConstraint instanceof Sequentially) { - $constraints[] = $propertyConstraint->getNestedContraints(); + if ($propertyConstraint instanceof Sequentially || $propertyConstraint instanceof Compound) { + $constraints[] = method_exists($propertyConstraint, 'getNestedContraints') ? $propertyConstraint->getNestedContraints() : $propertyConstraint->getNestedConstraints(); } else { $constraints[] = [$propertyConstraint]; }