namespace Symfony\Component\Validator\Constraints;
-use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException;
+use Symfony\Component\PropertyAccess\PropertyAccess;
+use Symfony\Component\PropertyAccess\PropertyAccessor;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
use Symfony\Component\Validator\Exception\UnexpectedTypeException;
/**
*/
abstract class AbstractComparisonValidator extends ConstraintValidator
{
+ private $propertyAccessor;
+
+ public function __construct(PropertyAccessor $propertyAccessor = null)
+ {
+ $this->propertyAccessor = $propertyAccessor;
+ }
+
/**
* {@inheritdoc}
*/
return;
}
- $comparedValue = $constraint->value;
+ if ($path = $constraint->propertyPath) {
+ if (null === $object = $this->context->getObject()) {
+ return;
+ }
+
+ try {
+ $comparedValue = $this->getPropertyAccessor()->getValue($object, $path);
+ } catch (NoSuchPropertyException $e) {
+ throw new ConstraintDefinitionException(sprintf('Invalid property path "%s" provided to "%s" constraint: %s', $path, get_class($constraint), $e->getMessage()), 0, $e);
+ }
+ } else {
+ $comparedValue = $constraint->value;
+ }
// Convert strings to DateTimes if comparing another DateTime
// This allows to compare with any date/time value supported by
if ($value instanceof \DateTimeImmutable) {
// If $value is immutable, convert the compared value to a
// DateTimeImmutable too
- $comparedValue = new \DatetimeImmutable($comparedValue);
- } elseif ($value instanceof \DateTime || $value instanceof \DateTimeInterface) {
+ $comparedValue = new \DateTimeImmutable($comparedValue);
+ } elseif ($value instanceof \DateTimeInterface) {
// Otherwise use DateTime
$comparedValue = new \DateTime($comparedValue);
}
}
if (!$this->compareValues($value, $comparedValue)) {
- if ($this->context instanceof ExecutionContextInterface) {
- $this->context->buildViolation($constraint->message)
- ->setParameter('{{ value }}', $this->formatValue($value, self::OBJECT_TO_STRING | self::PRETTY_DATE))
- ->setParameter('{{ compared_value }}', $this->formatValue($comparedValue, self::OBJECT_TO_STRING | self::PRETTY_DATE))
- ->setParameter('{{ compared_value_type }}', $this->formatTypeOf($comparedValue))
- ->setCode($this->getErrorCode())
- ->addViolation();
- } else {
- $this->buildViolation($constraint->message)
- ->setParameter('{{ value }}', $this->formatValue($value, self::OBJECT_TO_STRING | self::PRETTY_DATE))
- ->setParameter('{{ compared_value }}', $this->formatValue($comparedValue, self::OBJECT_TO_STRING | self::PRETTY_DATE))
- ->setParameter('{{ compared_value_type }}', $this->formatTypeOf($comparedValue))
- ->setCode($this->getErrorCode())
- ->addViolation();
- }
+ $this->context->buildViolation($constraint->message)
+ ->setParameter('{{ value }}', $this->formatValue($value, self::OBJECT_TO_STRING | self::PRETTY_DATE))
+ ->setParameter('{{ compared_value }}', $this->formatValue($comparedValue, self::OBJECT_TO_STRING | self::PRETTY_DATE))
+ ->setParameter('{{ compared_value_type }}', $this->formatTypeOf($comparedValue))
+ ->setCode($this->getErrorCode())
+ ->addViolation();
}
}
+ private function getPropertyAccessor()
+ {
+ if (null === $this->propertyAccessor) {
+ $this->propertyAccessor = PropertyAccess::createPropertyAccessor();
+ }
+
+ return $this->propertyAccessor;
+ }
+
/**
* Compares the two given values to find if their relationship is valid.
*