Skip to content

fix: use getNestedConstraints() instead of getNestedContraints wh… #4583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 3, 2021
Merged

fix: use getNestedConstraints() instead of getNestedContraints wh… #4583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e5c2d0
fix: use `getNestedConstraints()` instead of `getNestedContraints` wh…
azjezz Nov 25, 2021
758b5e5
test: normalizer deprecation
soyuka Dec 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/Bridge/Symfony/Identifier/Normalizer/UuidNormalizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ final class UuidNormalizer implements DenormalizerInterface
{
/**
* {@inheritdoc}
*
* @return mixed
*/
public function denormalize($data, $class, $format = null, array $context = [])
{
Expand All @@ -36,6 +38,8 @@ public function denormalize($data, $class, $format = null, array $context = [])

/**
* {@inheritdoc}
*
* @return bool
*/
public function supportsDenormalization($data, $type, $format = null)
{
Expand Down
2 changes: 1 addition & 1 deletion ...Bridge/Symfony/Validator/Metadata/Property/Restriction/PropertySchemaOneOfRestriction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
5 changes: 3 additions & 2 deletions src/Bridge/Symfony/Validator/Metadata/Property/ValidatorPropertyMetadataFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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];
}
Expand Down