Introduced StructValidator to unpack validation errors for structs

src/bundle/Core/Resources/config/services.yml

@@ -373,6 +373,7 @@ services:
 
     Ibexa\Contracts\Core\Validation\StructValidator:
         decorates: 'validator'
-        decoration_priority: -10
+        # Decorator priority is higher than debug.validator to ensure profiler receives struct errors
+        decoration_priority: 500
         arguments:
           $inner: '@.inner'

src/contracts/Validation/AbstractValidationStructWrapper.php

@@ -10,6 +10,8 @@
 
 /**
  * @template T of object
+ *
+ * @implements \Ibexa\Contracts\Core\Validation\ValidatorStructWrapperInterface<T>
  */
 abstract class AbstractValidationStructWrapper implements ValidatorStructWrapperInterface
 {

src/contracts/Validation/StructValidator.php

@@ -47,15 +47,17 @@ public function validate($value, $constraints = null, $groups = null): Constrain
         $prefix = ltrim($value->getStructName(), '$') . '.';
         foreach ($result as $error) {
             $path = $error->getPropertyPath();
+            $root = $error->getRoot();
             if (str_starts_with($path, $prefix)) {
                 $path = substr($path, strlen($prefix));
+                $root = $value->getStruct();
             }
 
             $unwrappedError = new ConstraintViolation(
                 $error->getMessage(),
                 $error->getMessageTemplate(),
                 $error->getParameters(),
-                $error->getRoot(),
+                $root,
                 $path,
                 $error->getInvalidValue(),
                 $error->getPlural(),

src/contracts/Validation/ValidatorStructWrapperInterface.php

@@ -6,7 +6,15 @@
  */
 namespace Ibexa\Contracts\Core\Validation;
 
+/**
+ * @template T of object
+ */
 interface ValidatorStructWrapperInterface
 {
     public function getStructName(): string;
+
+    /**
+     * @phpstan-return T
+     */
+    public function getStruct(): object;
 }

tests/lib/Validation/StructValidatorTest.php

@@ -71,35 +71,41 @@ public function testAssertValidStructWithInvalidStruct(): void
 
         $error = $errors->get(0);
         self::assertSame($initialError, $error);
-        self::assertEquals('validation error', $error->getMessage());
-        self::assertEquals('struct.property', $error->getPropertyPath());
+        self::assertSame('validation error', $error->getMessage());
+        self::assertSame('struct.property', $error->getPropertyPath());
     }
 
     public function testAssertValidStructWithInvalidWrapperStruct(): void
     {
         $initialError = $this->createExampleConstraintViolation();
         $initialErrors = $this->createExampleConstraintViolationList($initialError);
 
-        $struct = $this->createMock(ValidatorStructWrapperInterface::class);
-        $struct->expects(self::once())
+        $wrapper = $this->createMock(ValidatorStructWrapperInterface::class);
+        $wrapper->expects(self::once())
             ->method('getStructName')
             ->willReturn('$struct');
 
+        $struct = new stdClass();
+        $wrapper->expects(self::once())
+            ->method('getStruct')
+            ->willReturn($struct);
+
         $this->validator
             ->method('validate')
             ->with(
-                $struct,
+                $wrapper,
                 null,
                 ['Default', 'group']
             )->willReturn($initialErrors);
 
-        $errors = $this->structValidator->validate($struct, null, ['Default', 'group']);
+        $errors = $this->structValidator->validate($wrapper, null, ['Default', 'group']);
         self::assertNotSame($initialErrors, $errors);
         self::assertCount(1, $errors);
 
         $error = $errors->get(0);
         self::assertNotSame($error, $initialError);
         self::assertSame('validation error', $error->getMessage());
+        self::assertSame($struct, $error->getRoot());
         self::assertSame('property', $error->getPropertyPath());
     }