Add "__" to rule IDS

Author: henriquemoody

library/Message/StandardFormatter.php

@@ -104,7 +104,7 @@ public function array(Result $result, array $templates, Translator $translator):
 
         $children = [];
         foreach ($this->extractDeduplicatedChildren($result) as $child) {
-            $childKey = $child->path ?? $child->id;
+            $childKey = $child->path ?? '__' . $child->id;
 
             $children[$childKey] = $this->array(
                 $child,
@@ -120,7 +120,7 @@ public function array(Result $result, array $templates, Translator $translator):
         }
 
         if (count($children) === 0 || $this->isFinalTemplate($result, $selectedTemplates)) {
-            return [$result->path ?? $result->id => $messages['__root']];
+            return [$result->path ?? '__' . $result->id => $messages['__root']];
         }
 
         if ($result->path !== null) {
@@ -172,7 +172,7 @@ private function getTemplated(Result $result, array $templates): Result
             return $result;
         }
 
-        foreach ([$result->path, $result->name, $result->id, '__root'] as $key) {
+        foreach ([$result->path, $result->name, '__' . $result->id, '__root'] as $key) {
             if (!isset($templates[$key])) {
                 continue;
             }
@@ -194,7 +194,7 @@ private function getTemplated(Result $result, array $templates): Result
      */
     private function isFinalTemplate(Result $result, array $templates): bool
     {
-        $keys = [$result->path, $result->name, $result->id];
+        $keys = [$result->path, $result->name, '__'.$result->id];
         foreach ($keys as $key) {
             if (isset($templates[$key]) && is_string($templates[$key])) {
                 return true;
@@ -221,7 +221,7 @@ private function isFinalTemplate(Result $result, array $templates): bool
      */
     private function selectTemplates(Result $result, array $templates): array
     {
-        foreach ([$result->path, $result->name, $result->id] as $key) {
+        foreach ([$result->path, $result->name, '__'.$result->id] as $key) {
             if (isset($templates[$key]) && is_array($templates[$key])) {
                 return $templates[$key];
             }

library/Rules/KeyExists.php

@@ -38,7 +38,7 @@ public function getKey(): int|string
 
     public function evaluate(mixed $input): Result
     {
-        return new Result($this->hasKey($input), $input, $this, name: (string) $this->key, id: (string) $this->key);
+        return new Result($this->hasKey($input), $input, $this, name: (string) $this->key, path: $this->key);
     }
 
     private function hasKey(mixed $input): bool

library/Rules/PropertyExists.php

@@ -32,7 +32,7 @@ public function __construct(
     public function evaluate(mixed $input): Result
     {
         if (!is_object($input)) {
-            return Result::failed($input, $this)->withNameIfMissing($this->propertyName)->withId($this->propertyName);
+            return Result::failed($input, $this)->withNameIfMissing($this->propertyName)->withPath($this->propertyName);
         }
 
         $reflection = new ReflectionObject($input);
@@ -42,7 +42,7 @@ public function evaluate(mixed $input): Result
             $input,
             $this,
             name: $this->propertyName,
-            id: $this->propertyName
+            path: $this->propertyName
         );
     }
 }

tests/feature/AssertWithTemplatesTest.php

@@ -11,26 +11,26 @@
     fn() => v::alwaysInvalid()->setTemplate('My string template in the chain')->assert(1),
     'My string template in the chain',
     '- My string template in the chain',
-    ['alwaysInvalid' => 'My string template in the chain']
+    ['__alwaysInvalid' => 'My string template in the chain']
 ));
 
 test('Template as an array in the chain', expectAll(
-    fn() => v::alwaysInvalid()->setTemplates(['alwaysInvalid' => 'My array template in the chain'])->assert(1),
+    fn() => v::alwaysInvalid()->setTemplates(['__alwaysInvalid' => 'My array template in the chain'])->assert(1),
     'My array template in the chain',
     '- My array template in the chain',
-    ['alwaysInvalid' => 'My array template in the chain']
+    ['__alwaysInvalid' => 'My array template in the chain']
 ));
 
 test('Runtime template as string', expectAll(
     fn() => v::alwaysInvalid()->assert(1, 'My runtime template as string'),
     'My runtime template as string',
     '- My runtime template as string',
-    ['alwaysInvalid' => 'My runtime template as string']
+    ['__alwaysInvalid' => 'My runtime template as string']
 ));
 
 test('Runtime template as an array', expectAll(
-    fn() => v::alwaysInvalid()->assert(1, ['alwaysInvalid' => 'My runtime template an array']),
+    fn() => v::alwaysInvalid()->assert(1, ['__alwaysInvalid' => 'My runtime template an array']),
     'My runtime template an array',
     '- My runtime template an array',
-    ['alwaysInvalid' => 'My runtime template an array']
+    ['__alwaysInvalid' => 'My runtime template an array']
 ));

tests/feature/Issues/Issue1289Test.php

@@ -59,8 +59,8 @@
             '__root' => 'These rules must pass for `["default": 2, "description": [], "children": ["nope"]]`',
             'default' => [
                 '__root' => 'Only one of these rules must pass for default',
-                'stringType' => 'default must be a string',
-                'boolType' => 'default must be a boolean',
+                '__stringType' => 'default must be a string',
+                '__boolType' => 'default must be a boolean',
             ],
             'description' => 'description must be a string value',
         ],

tests/feature/Issues/Issue1333Test.php

@@ -17,7 +17,7 @@
     FULL_MESSAGE,
     [
         '__root' => 'All the required rules must pass for User Email',
-        'noWhitespace' => 'User Email must not contain whitespaces',
-        'email' => 'User Email must be a valid email address',
+        '__noWhitespace' => 'User Email must not contain whitespaces',
+        '__email' => 'User Email must be a valid email address',
     ]
 ));

tests/feature/Issues/Issue1469Test.php

@@ -40,15 +40,15 @@ function (): void {
     FULL_MESSAGE,
     [
         '__root' => 'These rules must pass for `["order_items": [["product_title": test(?string $description = null, ?Closure $closure = null): Pest\Support\Hig ... ]`',
-        'keySet' => [
+        '__keySet' => [
             '__root' => '`["order_items": [["product_title": test(?string $description = null, ?Closure $closure = null): Pest\Support\Hig ... ]` validation failed',
-            'each' => [
+            '__each' => [
                 '__root' => 'Each item in order_items must be valid',
                 0 => [
                     '__root' => 'order_items validation failed',
                     'quantity' => [
                         '__root' => 'These rules must pass for quantity',
-                        'intVal' => 'quantity must be an integer value',
+                        '__intVal' => 'quantity must be an integer value',
                     ],
                 ],
                 1 => [

tests/feature/Issues/Issue619Test.php

@@ -11,5 +11,5 @@
     fn() => v::instance(stdClass::class)->setTemplate('invalid object')->assert('test'),
     'invalid object',
     '- invalid object',
-    ['instance' => 'invalid object']
+    ['__instance' => 'invalid object']
 ));

tests/feature/Issues/Issue739Test.php

@@ -11,5 +11,5 @@
     fn() => v::when(v::alwaysInvalid(), v::alwaysValid())->assert('foo'),
     '"foo" is invalid',
     '- "foo" is invalid',
-    ['alwaysInvalid' => '"foo" is invalid']
+    ['__alwaysInvalid' => '"foo" is invalid']
 ));

tests/feature/Issues/Issue799Test.php

@@ -26,7 +26,7 @@
     FULL_MESSAGE,
     [
         '__root' => 'All the required rules must pass for 1',
-        'arrayVal' => '1 must be an array value',
+        '__arrayVal' => '1 must be an array value',
         'scheme' => 'scheme must be present',
     ]
 ));