From 92f820a09452c5146e31eeb872c5779b9b590623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20H=C3=B6rl?= Date: Wed, 18 Jan 2012 22:24:42 +0100 Subject: [PATCH] Renamed registerConstraints to loadDynamicValidatorMetadata --- src/Symfony/Component/Validator/ConstraintProviderInterface.php | 2 +- src/Symfony/Component/Validator/Validator.php | 2 +- .../Component/Validator/Fixtures/DynamicConstraintsEntity.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/Validator/ConstraintProviderInterface.php b/src/Symfony/Component/Validator/ConstraintProviderInterface.php index 628fad4693..c081d3ad13 100644 --- a/src/Symfony/Component/Validator/ConstraintProviderInterface.php +++ b/src/Symfony/Component/Validator/ConstraintProviderInterface.php @@ -23,5 +23,5 @@ interface ConstraintProviderInterface * * @param Mapping\ClassMetadata */ - function registerConstraints(ClassMetadata $metadata); + function loadDynamicValidatorMetadata(ClassMetadata $metadata); } diff --git a/src/Symfony/Component/Validator/Validator.php b/src/Symfony/Component/Validator/Validator.php index dbbf786fe3..2327aa1c0b 100644 --- a/src/Symfony/Component/Validator/Validator.php +++ b/src/Symfony/Component/Validator/Validator.php @@ -62,7 +62,7 @@ class Validator implements ValidatorInterface if ($object instanceof ConstraintProviderInterface) { $dynamicMetadata = new ClassMetadata(get_class($object)); $dynamicMetadata->mergeConstraints($metadata); - $object->registerConstraints($dynamicMetadata); + $object->loadDynamicValidatorMetadata($dynamicMetadata); $metadata = $dynamicMetadata; } diff --git a/tests/Symfony/Tests/Component/Validator/Fixtures/DynamicConstraintsEntity.php b/tests/Symfony/Tests/Component/Validator/Fixtures/DynamicConstraintsEntity.php index e0d5a66a9a..41bfe44d39 100644 --- a/tests/Symfony/Tests/Component/Validator/Fixtures/DynamicConstraintsEntity.php +++ b/tests/Symfony/Tests/Component/Validator/Fixtures/DynamicConstraintsEntity.php @@ -20,7 +20,7 @@ class DynamicConstraintsEntity implements ConstraintProviderInterface return null; } - public function registerConstraints(ClassMetadata $metadata) + public function loadDynamicValidatorMetadata(ClassMetadata $metadata) { if ($this->validationEnabled) { $metadata->addPropertyConstraint('firstValue', new FailingConstraint());