Add the possibility to add a context to a validation

src/Assertion/Asserter.php

@@ -51,7 +51,7 @@ public function assert(mixed $subject, ValidationInterface $validation): Validat
             $message = $validation->getMessage();
             if (null !== $message) {
                 $failures->add(
-                    $this->validationFailureFactory->create($message, $subject, $validation->getProperty())
+                    $this->validationFailureFactory->create($validation, $message, $subject)
                 );
 
                 return $failures;
@@ -60,7 +60,7 @@ public function assert(mixed $subject, ValidationInterface $validation): Validat
             $exceptionMessages = $this->extractMessagesFromException($exception, $validation);
             foreach ($exceptionMessages as $ruleName => $message) {
                 $failures->add(
-                    $this->validationFailureFactory->create($message, $subject, $validation->getProperty(), $ruleName)
+                    $this->validationFailureFactory->create($validation, $message, $subject, $ruleName)
                 );
             }
         }

src/Failure/ValidationFailure.php

@@ -13,6 +13,8 @@
 
 namespace Awurth\Validator\Failure;
 
+use Awurth\Validator\ValidationInterface;
+
 /**
  * Represents a validation failure.
  *
@@ -21,13 +23,18 @@
 final class ValidationFailure implements ValidationFailureInterface
 {
     public function __construct(
+        private readonly ValidationInterface $validation,
         private readonly string $message,
         private readonly mixed $invalidValue,
-        private readonly ?string $property = null,
         private readonly ?string $ruleName = null,
     ) {
     }
 
+    public function getValidation(): ValidationInterface
+    {
+        return $this->validation;
+    }
+
     public function getInvalidValue(): mixed
     {
         return $this->invalidValue;
@@ -38,11 +45,6 @@ public function getMessage(): string
         return $this->message;
     }
 
-    public function getProperty(): ?string
-    {
-        return $this->property;
-    }
-
     public function getRuleName(): ?string
     {
         return $this->ruleName;

src/Failure/ValidationFailureFactory.php

@@ -13,6 +13,8 @@
 
 namespace Awurth\Validator\Failure;
 
+use Awurth\Validator\ValidationInterface;
+
 /**
  * Handles the creation of a validation failure.
  *
@@ -21,11 +23,11 @@
 final class ValidationFailureFactory implements ValidationFailureFactoryInterface
 {
     public function create(
+        ValidationInterface $validation,
         string $message,
         mixed $invalidValue,
-        ?string $property = null,
         ?string $ruleName = null,
     ): ValidationFailureInterface {
-        return new ValidationFailure($message, $invalidValue, $property, $ruleName);
+        return new ValidationFailure($validation, $message, $invalidValue, $ruleName);
     }
 }

src/Failure/ValidationFailureFactoryInterface.php

@@ -13,6 +13,8 @@
 
 namespace Awurth\Validator\Failure;
 
+use Awurth\Validator\ValidationInterface;
+
 /**
  * Handles the creation of a validation failure.
  *
@@ -25,8 +27,7 @@ interface ValidationFailureFactoryInterface
      *
      * @param string      $message      The error message
      * @param mixed       $invalidValue The invalid value
-     * @param string|null $property     The object property, array key or request parameter
      * @param string|null $ruleName     The Respect/Validation rule name
      */
-    public function create(string $message, mixed $invalidValue, ?string $property = null, ?string $ruleName = null): ValidationFailureInterface;
+    public function create(ValidationInterface $validation, string $message, mixed $invalidValue, ?string $ruleName = null): ValidationFailureInterface;
 }

src/Failure/ValidationFailureInterface.php

@@ -13,13 +13,17 @@
 
 namespace Awurth\Validator\Failure;
 
+use Awurth\Validator\ValidationInterface;
+
 /**
  * Represents a validation failure.
  *
  * @author Alexis Wurth <awurth.dev@gmail.com>
  */
 interface ValidationFailureInterface
 {
+    public function getValidation(): ValidationInterface;
+
     /**
      * Gets the validated data.
      */
@@ -30,11 +34,6 @@ public function getInvalidValue(): mixed;
      */
     public function getMessage(): string;
 
-    /**
-     * Gets the object property, array key or request parameter.
-     */
-    public function getProperty(): ?string;
-
     /**
      * Gets the Respect/Validation rule name.
      */

src/StatefulValidator.php

@@ -38,9 +38,11 @@ public static function create(?AsserterInterface $asserter = null): self
         );
     }
 
-    public function validate(mixed $subject, Validatable|array $rules, array $messages = []): ValidationFailureCollectionInterface
+    public function validate(mixed $subject, Validatable|array $rules, array $messages = [], mixed $context = null): ValidationFailureCollectionInterface
     {
-        $this->failures->addAll($this->validator->validate($subject, $rules, $messages));
+        $failures = $this->validator->validate($subject, $rules, $messages, $context);
+
+        $this->failures->addAll($failures);
 
         return $this->failures;
     }

src/Twig/LegacyValidatorExtension.php

@@ -71,7 +71,7 @@ public function getFunctions(): array
 
     public function getError(string $key, int $index = 0): ?string
     {
-        $failures = $this->validator->getFailures()->filter(static fn (ValidationFailureInterface $failure): bool => $failure->getProperty() === $key);
+        $failures = $this->validator->getFailures()->filter(static fn (ValidationFailureInterface $failure): bool => $failure->getValidation()->getProperty() === $key);
         $failure = $failures->has($index) ? $failures->get($index) : null;
 
         return $failure?->getMessage();
@@ -84,7 +84,7 @@ public function getErrors(?string $key = null): array
     {
         $failures = null === $key
             ? $this->validator->getFailures()
-            : $this->validator->getFailures()->filter(static fn (ValidationFailureInterface $failure) => $failure->getProperty() === $key)
+            : $this->validator->getFailures()->filter(static fn (ValidationFailureInterface $failure) => $failure->getValidation()->getProperty() === $key)
         ;
 
         return \array_map(
@@ -106,7 +106,7 @@ public function getValue(string $key): mixed
 
     public function hasError(string $key): bool
     {
-        return null !== $this->validator->getFailures()->find(static fn (ValidationFailureInterface $failure) => $failure->getProperty() === $key);
+        return null !== $this->validator->getFailures()->find(static fn (ValidationFailureInterface $failure) => $failure->getValidation()->getProperty() === $key);
     }
 
     public function hasErrors(): bool

src/Validation.php

@@ -29,6 +29,7 @@ public function __construct(
         private readonly ?string $message = null,
         private readonly array $messages = [],
         private readonly array $globalMessages = [],
+        private readonly mixed $context = null,
     ) {
     }
 
@@ -61,4 +62,9 @@ public function getGlobalMessages(): array
     {
         return $this->globalMessages;
     }
+
+    public function getContext(): mixed
+    {
+        return $this->context;
+    }
 }

src/ValidationFactory.php

@@ -36,6 +36,7 @@ public function create(array $options, ?string $property = null, mixed $default
             $options['message'],
             $options['messages'],
             $options['globalMessages'],
+            $options['context'],
         );
     }
 
@@ -48,6 +49,7 @@ private static function getOptionsResolver(): OptionsResolver
                     'message' => null,
                     'messages' => [],
                     'globalMessages' => [],
+                    'context' => null,
                 ])
                 ->setRequired('rules')
                 ->setAllowedTypes('rules', Validatable::class)

src/ValidationInterface.php

@@ -24,6 +24,9 @@ interface ValidationInterface
 {
     public function getRules(): Validatable;
 
+    /**
+     * Gets the object property, array key or request parameter.
+     */
     public function getProperty(): ?string;
 
     public function getDefault(): mixed;
@@ -33,4 +36,6 @@ public function getMessage(): ?string;
     public function getMessages(): array;
 
     public function getGlobalMessages(): array;
+
+    public function getContext(): mixed;
 }

src/Validator.php

@@ -48,17 +48,19 @@ public static function create(
         );
     }
 
-    public function validate(mixed $subject, Validatable|array $rules, array $messages = []): ValidationFailureCollectionInterface
+    public function validate(mixed $subject, Validatable|array $rules, array $messages = [], mixed $context = null): ValidationFailureCollectionInterface
     {
         if ($rules instanceof Validatable) {
             return $this->asserter->assert($subject, $this->validationFactory->create([
                 'rules' => $rules,
                 'globalMessages' => $messages,
+                'context' => $context,
             ]), $messages);
         }
 
         if (!$subject instanceof Request && !\is_object($subject) && !\is_array($subject)) {
             $rules['globalMessages'] = $messages;
+            $rules['context'] = $context;
 
             return $this->asserter->assert($subject, $this->validationFactory->create($rules), $messages);
         }
@@ -76,6 +78,7 @@ public function validate(mixed $subject, Validatable|array $rules, array $messag
             }
 
             $options['globalMessages'] = $messages;
+            $options['context'] = $context;
 
             $validation = $this->validationFactory->create($options, $property);
             $value = $this->getValue($subject, $property, $validation->getDefault());

src/ValidatorInterface.php

@@ -21,5 +21,5 @@ interface ValidatorInterface
     /**
      * @param array<string, string> $messages
      */
-    public function validate(mixed $subject, Validatable|array $rules, array $messages = []): ValidationFailureCollectionInterface;
+    public function validate(mixed $subject, Validatable|array $rules, array $messages = [], mixed $context = null): ValidationFailureCollectionInterface;
 }

tests/Twig/LegacyValidatorExtensionTest.php

@@ -24,25 +24,25 @@
 use Awurth\Validator\ValidatedValueCollectionInterface;
 use Awurth\Validator\Validation;
 use PHPUnit\Framework\TestCase;
-use Respect\Validation\Validator;
+use Respect\Validation\Validator as V;
 
-class LegacyValidatorExtensionTest extends TestCase
+final class LegacyValidatorExtensionTest extends TestCase
 {
     public function testGetError(): void
     {
         $extension = self::createExtension(new ValidationFailureCollection([
-            new ValidationFailure('first message', null, 'first'),
-            new ValidationFailure('second message', null, 'second'),
+            new ValidationFailure(new Validation(V::alwaysInvalid(), 'first'), 'first message', null),
+            new ValidationFailure(new Validation(V::alwaysInvalid(), 'second'), 'second message', null),
         ]));
 
         self::assertSame('first message', $extension->getError('first'));
         self::assertSame('second message', $extension->getError('second'));
 
         $extension = self::createExtension(new ValidationFailureCollection([
-            new ValidationFailure('first message of first property', null, 'first'),
-            new ValidationFailure('first message of second property', null, 'second'),
-            new ValidationFailure('second message of second property', null, 'second'),
-            new ValidationFailure('second message of first property', null, 'first'),
+            new ValidationFailure(new Validation(V::alwaysInvalid(), 'first'), 'first message of first property', null),
+            new ValidationFailure(new Validation(V::alwaysInvalid(), 'second'), 'first message of second property', null),
+            new ValidationFailure(new Validation(V::alwaysInvalid(), 'second'), 'second message of second property', null),
+            new ValidationFailure(new Validation(V::alwaysInvalid(), 'first'), 'second message of first property', null),
         ]));
 
         self::assertSame('first message of first property', $extension->getError('first'));
@@ -56,10 +56,10 @@ public function testGetError(): void
     public function testGetErrors(): void
     {
         $extension = self::createExtension(new ValidationFailureCollection([
-            new ValidationFailure('first', null, 'first'),
-            new ValidationFailure('second', null, 'second'),
-            new ValidationFailure('third', null, 'third'),
-            new ValidationFailure('fourth', null, 'third'),
+            new ValidationFailure(new Validation(V::alwaysInvalid(), 'first'), 'first', null),
+            new ValidationFailure(new Validation(V::alwaysInvalid(), 'second'), 'second', null),
+            new ValidationFailure(new Validation(V::alwaysInvalid(), 'third'), 'third', null),
+            new ValidationFailure(new Validation(V::alwaysInvalid(), 'third'), 'fourth', null),
         ]));
 
         self::assertSame(['first', 'second', 'third', 'fourth'], $extension->getErrors());
@@ -69,7 +69,7 @@ public function testGetErrors(): void
     public function testGetValue(): void
     {
         $extension = self::createExtension(data: new ValidatedValueCollection([
-            new ValidatedValue(new Validation(Validator::alwaysInvalid(), 'property'), 'invalid string'),
+            new ValidatedValue(new Validation(V::alwaysInvalid(), 'property'), 'invalid string'),
         ]));
 
         self::assertSame('invalid string', $extension->getValue('property'));
@@ -79,7 +79,7 @@ public function testGetValue(): void
     public function testHasError(): void
     {
         $extension = self::createExtension(new ValidationFailureCollection([
-            new ValidationFailure('message', null, 'property'),
+            new ValidationFailure(new Validation(V::alwaysInvalid(), 'property'), 'message', null),
         ]));
 
         self::assertTrue($extension->hasError('property'));
@@ -93,7 +93,7 @@ public function testHasErrors(): void
         self::assertFalse($extension->hasErrors());
 
         $extension = self::createExtension(new ValidationFailureCollection([
-            new ValidationFailure('message', null, 'property'),
+            new ValidationFailure(new Validation(V::alwaysInvalid(), 'property'), 'message', null),
         ]));
 
         self::assertTrue($extension->hasErrors());