Simplify wrapper

ibexa · Nov 18, 2024 · 84ee00f · 84ee00f
1 parent ccb944e
commit 84ee00f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/src/contracts/Validation/StructWrapperValidator.php b/src/contracts/Validation/StructWrapperValidator.php
@@ -45,13 +45,11 @@ public function validate($value, $constraints = null, $groups = null): Constrain
 
         $unwrappedErrors = new ConstraintViolationList();
 
-        // Skip $ from argument name
-        $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));
+            if (str_starts_with($path, 'struct.')) {
+                $path = substr($path, strlen('struct.'));
                 $root = $value->getStruct();
             }
 

diff --git a/src/contracts/Validation/ValidationStructWrapperInterface.php b/src/contracts/Validation/ValidationStructWrapperInterface.php
@@ -8,15 +8,17 @@
 
 namespace Ibexa\Contracts\Core\Validation;
 
+use Symfony\Component\Validator\Constraints as Assert;
+
 /**
  * @template T of object
  */
 interface ValidationStructWrapperInterface
 {
-    public function getStructName(): string;
-
     /**
      * @phpstan-return T
+     *
+     * @Assert\Valid()
      */
     public function getStruct(): object;
 }
diff --git a/tests/lib/Validation/StructWrapperValidatorTest.php b/tests/lib/Validation/StructWrapperValidatorTest.php
@@ -83,9 +83,6 @@ public function testAssertValidStructWithInvalidWrapperStruct(): void
         $initialErrors = $this->createExampleConstraintViolationList($initialError);
 
         $wrapper = $this->createMock(ValidationStructWrapperInterface::class);
-        $wrapper->expects(self::once())
-            ->method('getStructName')
-            ->willReturn('$struct');
 
         $struct = new stdClass();
         $wrapper->expects(self::once())