v2

Author: henriquemoody

library/Message/StandardFormatter.php

@@ -14,10 +14,13 @@
 
 use function array_filter;
 use function array_key_exists;
+use function array_map;
 use function array_reduce;
 use function array_values;
 use function count;
 use function current;
+use function end;
+use function explode;
 use function is_array;
 use function is_string;
 use function Respect\Stringifier\stringify;
@@ -42,11 +45,7 @@ public function main(Result $result, array $templates, Translator $translator):
         $selectedTemplates = $this->selectTemplates($result, $templates);
         if (!$this->isFinalTemplate($result, $selectedTemplates)) {
             foreach ($this->extractDeduplicatedChildren($result) as $child) {
-                if ($result->path !== null && $child->path !== null && $child->path !== $result->path) {
-                    $child = $child->withPath($result->path);
-                } elseif ($result->path !== null && $child->path === null) {
-                    $child = $child->withPath($result->path);
-                }
+                $child = $this->resultWithPath($result, $child);
 
                 return $this->main($child, $selectedTemplates, $translator);
             }
@@ -63,32 +62,38 @@ public function full(
         array $templates,
         Translator $translator,
         int $depth = 0,
-        ?Result $parent = null,
         Result ...$siblings
     ): string {
         $selectedTemplates = $this->selectTemplates($result, $templates);
         $isFinalTemplate = $this->isFinalTemplate($result, $selectedTemplates);
 
         $rendered = '';
         if ($this->isAlwaysVisible($result, ...$siblings) || $isFinalTemplate) {
+            $resultToRender = $result;
+            if ($depth > 0 && $result->path !== null) {
+                $paths = explode('.', (string) $result->path);
+                $resultToRender->path = end($paths);
+            }
             $indentation = str_repeat(' ', $depth * 2);
             $rendered .= sprintf(
                 '%s- %s' . PHP_EOL,
                 $indentation,
-                $this->renderer->render($this->getTemplated($result, $selectedTemplates), $translator),
+                $this->renderer->render($this->getTemplated($resultToRender, $selectedTemplates), $translator),
             );
             $depth++;
         }
 
         if (!$isFinalTemplate) {
-            $results = $this->extractDeduplicatedChildren($result);
+            $results = array_map(
+                fn(Result $child) => $this->resultWithPath($result, $child),
+                $this->extractDeduplicatedChildren($result)
+            );
             foreach ($results as $child) {
                 $rendered .= $this->full(
                     $child,
                     $selectedTemplates,
                     $translator,
                     $depth,
-                    $result,
                     ...array_filter($results, static fn (Result $sibling) => $sibling !== $child)
                 );
                 $rendered .= PHP_EOL;
@@ -142,6 +147,19 @@ public function array(Result $result, array $templates, Translator $translator):
         return $messages;
     }
 
+    public function resultWithPath(Result $parent, Result $child): Result
+    {
+        if ($parent->path !== null && $child->path !== null && $child->path !== $parent->path) {
+            return $child->withPath($parent->path);
+        }
+
+        if ($parent->path !== null && $child->path === null) {
+            return $child->withPath($parent->path);
+        }
+
+        return $child;
+    }
+
     private function isAlwaysVisible(Result $result, Result ...$siblings): bool
     {
         if ($result->isValid) {

library/Result.php

@@ -10,7 +10,6 @@
 namespace Respect\Validation;
 
 use Respect\Validation\Rules\Core\Nameable;
-use Respect\Validation\Rules\Core\Renameable;
 
 use function array_filter;
 use function array_map;
@@ -39,7 +38,7 @@ public function __construct(
         public readonly ?string $name = null,
         ?string $id = null,
         public readonly ?Result $adjacent = null,
-        public readonly string|int|null $path = null,
+        public string|int|null $path = null,
         Result ...$children,
     ) {
         $this->id = $id ?? lcfirst(substr((string) strrchr($rule::class, '\\'), 1));
@@ -119,10 +118,6 @@ public function withPath(string|int $path): self
         return $this->clone(
             adjacent: $this->adjacent?->withPath($path),
             path: $this->path === null ? $path : $path . '.' . $this->path,
-//            children: array_map(
-//                static fn (Result $child) => $child->path === null ? $child->withPath($child->name ?? $path) : $child,
-//                $this->children
-//            ),
         );
     }
 

library/Rules/KeyExists.php

@@ -14,7 +14,6 @@
 use Respect\Validation\Message\Template;
 use Respect\Validation\Result;
 use Respect\Validation\Rules\Core\KeyRelated;
-use Respect\Validation\Rules\Core\Renameable;
 use Respect\Validation\Rules\Core\Standard;
 
 use function array_key_exists;

library/Rules/PropertyExists.php

@@ -13,7 +13,6 @@
 use ReflectionObject;
 use Respect\Validation\Message\Template;
 use Respect\Validation\Result;
-use Respect\Validation\Rules\Core\Renameable;
 use Respect\Validation\Rules\Core\Standard;
 
 use function is_object;

tests/feature/Issues/Issue1289Test.php

@@ -49,17 +49,17 @@
     <<<'FULL_MESSAGE'
     - `.0` must pass the rules
       - `.default` must pass one of the rules
-        - 2 must be a string
-        - 2 must be a boolean
+        - `.default` must be a string
+        - `.default` must be a boolean
       - `.description` must be a string value
     FULL_MESSAGE,
     [
         0 => [
             '__root__' => '`.0` must pass the rules',
             'default' => [
                 '__root__' => '`.default` must pass one of the rules',
-                'stringType' => '2 must be a string',
-                'boolType' => '2 must be a boolean',
+                'stringType' => '`.default` be a string',
+                'boolType' => '`.default` be a boolean',
             ],
             'description' => '`.description` must be a string value',
         ],

tests/feature/Issues/Issue1334Test.php

@@ -28,22 +28,22 @@ function (): void {
       - `.0` must pass the rules
         - `.street` must be present
         - `.other` must pass the rules
-          - 123 must be a string or must be null
+          - `.other` must be a string or must be null
       - `.1` must pass the rules
-        - "" must not be empty
+        - `.street` must not be empty
       - `.2` must pass the rules
-        - 123 must be a string
+        - `.street` must be a string
     FULL_MESSAGE,
     [
         'each' => [
             '__root__' => 'Each item in `[["region": "Oregon", "country": "USA", "other": 123], ["street": "", "region": "Oregon", "country": "USA"], ["s ... ]` must be valid',
             0 => [
                 '__root__' => '`.0` must pass the rules',
                 'street' => '`.street` must be present',
-                'other' => '123 must be a string or must be null',
+                'other' => '`.other` must be a string or must be null',
             ],
-            1 => '"" must not be empty',
-            2 => '123 must be a string',
+            1 => '`.street` must not be empty',
+            2 => '`.street` must be a string',
         ],
     ],
 ));

tests/feature/Issues/Issue1376Test.php

@@ -20,8 +20,8 @@
       - `.title` must be present
       - `.description` must be present
       - `.author` must pass all the rules
-        - "foo" must be an integer
-        - The length of "foo" must be between 1 and 2
+        - `.author` must be an integer
+        - The length of `.author` must be between 1 and 2
       - `.user` must be present
     FULL_MESSAGE,
     [

tests/feature/Rules/EachTest.php

@@ -282,12 +282,12 @@
     FULL_MESSAGE,
     [
         '__root__' => 'Each item in `[["not_int": "wrong"], ["my_int": 2], "not an array"]` must be valid',
-        0 => 'my_int must be present',
-        1 => 'my_int must be an odd number',
+        0 => '`.my_int` must be present',
+        1 => '`.my_int` must be an odd number',
         2 => [
-            '__root__' => '"not an array" must pass all the rules',
-            'arrayType' => '"not an array" must be an array',
-            'my_int' => 'my_int must be present',
+            '__root__' => '`.2` must pass all the rules',
+            'arrayType' => '`.2` must be an array',
+            'my_int' => '`.my_int` must be present',
         ],
     ],
 ));