v3

Respect · Dec 26, 2024 · 4b79cec · 4b79cec
1 parent cdc8b7e
commit 4b79cec
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 25 deletions.
diff --git a/library/Result.php b/library/Result.php
@@ -137,12 +137,8 @@ public function withChildren(Result ...$children): self
 
     public function withName(string $name): self
     {
-        if ($this->unchangeableName) {
-            return $this;
-        }
-
         return $this->clone(
-            name: $name,
+            name: $this->name ?? $name,
             adjacent: $this->adjacent?->withName($name),
             unchangeableName: true,
         );

diff --git a/library/Rules/Key.php b/library/Rules/Key.php
@@ -33,14 +33,19 @@ public function getKey(): int|string
 
     public function evaluate(mixed $input): Result
     {
+        $name = (string) $this->key;
+        if ($this->rule instanceof Named) {
+            $name = $this->rule->getName();
+        }
+
         $keyExistsResult = (new KeyExists($this->key))->evaluate($input);
         if (!$keyExistsResult->isValid) {
-            return $keyExistsResult;
+            return $keyExistsResult->withName($name);
         }
 
         return $this->rule
             ->evaluate($input[$this->key])
-            ->withSoftName($keyExistsResult->name)
+            ->withName($name)
             ->withUnchangeableId((string) $this->key);
     }
 }
diff --git a/library/Rules/KeyExists.php b/library/Rules/KeyExists.php
@@ -41,7 +41,7 @@ public function evaluate(mixed $input): Result
     {
         $name = (string) $this->key;
 
-        return (new Result($this->hasKey($input), $input, $this, name: $name, id: $name));
+        return (new Result($this->hasKey($input), $input, $this, name: $name, id: $name, unchangeableName: true));
     }
 
     private function hasKey(mixed $input): bool

diff --git a/library/Rules/Named.php b/library/Rules/Named.php
@@ -13,6 +13,7 @@
 use Respect\Validation\Result;
 use Respect\Validation\Rule;
 use Respect\Validation\Rules\Core\Binder;
+use Respect\Validation\Rules\Core\Composite;
 use Respect\Validation\Rules\Core\Wrapper;
 
 use function array_map;
@@ -34,28 +35,18 @@ public function getName(): string
 
     public function evaluate(mixed $input): Result
     {
-        $result = (new Binder($this, $this->rule))->evaluate($input);
-        $name = $result->name ?? $this->name;
-        if ($result->unchangeableName === false) {
-            $name = $this->name;
-        }
-
-        $children = array_map(
-            fn (Result $child) => $this->enrichResult($child),
-            array_filter(
-                $result->children,
-                fn (Result $child) => !$child->rule instanceof Key
-            )
-        );
-
-        return $result->withName($name)->withChildren(...$children);
+        return $this->enrichResult((new Binder($this, $this->rule))->evaluate($input));
     }
 
     private function enrichResult(Result $result): Result
     {
         $name = $result->name ?? $this->name;
-        if ($result->unchangeableName === false) {
-            $name = $this->name;
+//        if ($result->unchangeableName === false) {
+//            $name = $this->name;
+//        }
+
+        if ($result->rule instanceof Composite) {
+            return $result->withName($name);
         }
 
         return $result

diff --git a/tests/feature/Rules/NamedTest.php b/tests/feature/Rules/NamedTest.php
@@ -51,6 +51,13 @@
     ['vegetable' => 'Broccoli must be present'],
 ));
 
+test('With property that does not exist #2', expectAll(
+    fn() => v::key('vegetable', v::named(v::stringType(), 'Broccoli'))->assert((object) []),
+    'Broccoli must be present',
+    '- Broccoli must be present',
+    ['vegetable' => 'Broccoli must be present'],
+));
+
 test('With key that fails validation', expectAll(
     fn() => v::named(v::key('vegetable', v::stringType()), 'Artichoke')->assert(['vegetable' => 12]),
     'Artichoke must be a string',