Preserve original attribute name for nested fields (#3)

preserve original attribute name for nested fields

Author: danilopolani

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to `laravel-json-validation-testing` will be documented in this file.
 
+## 1.0.1 - 2022-03-03
+
+**Fixed**
+- Preserve original attribute name for nested fields
+
 ## 1.0.0 - 2022-03-02
 
 - initial release

src/Validator.php

@@ -36,30 +36,44 @@ public function getErrorMessage(string $attribute, string|RuleContract $rule): a
             $messages = $messages ? (array) $messages : [get_class($rule)];
 
             foreach ($messages as $message) {
-                $result[] = $this->makeReplacements(
+                $result[] = $this->buildMessage(
                     $message,
                     $attribute,
                     get_class($rule),
-                    []
                 );
             }
 
             return $result;
         }
 
-        $attribute = str_replace(
-            [$this->dotPlaceholder, '__asterisk__'],
-            ['.', '*'],
-            $attribute
-        );
-
         return [
-            $this->makeReplacements(
+            $this->buildMessage(
                 $this->getMessage($attribute, $rule),
                 $attribute,
                 $rule,
                 $parameters
             ),
         ];
     }
+
+    /**
+     * Build the validation message.
+     *
+     * @param  string $message
+     * @param  string $attribute
+     * @param  string $rule
+     * @param  array $parameters
+     * @return string
+     */
+    protected function buildMessage(string $message, string $attribute, string $rule, array $parameters = []): string
+    {
+        $result = $this->makeReplacements(...func_get_args());
+
+        // Preserve original attribute name if nested (e.g. array.1.field)
+        if (str_contains($attribute, '.')) {
+            $result = str_replace($this->getDisplayableAttribute($attribute), $attribute, $result);
+        }
+
+        return $result;
+    }
 }

tests/ValidationRuleMessageTest.php

@@ -26,6 +26,9 @@
     expect(JsonValidation::getRuleErrorMessage('foo', 'required_without:bar'))->toBe([
         'The foo field is required when bar is not present.',
     ]);
+    expect(JsonValidation::getRuleErrorMessage('foo.1.bar', 'required'))->toBe([
+        'The foo.1.bar field is required.',
+    ]);
 });
 
 it('extracts the error message from a custom rule', function () {