浏览代码

More robust replacement of `:attribute` in validation rule descriptions (closes 633)

shalvah 2 年之前
父节点
当前提交
ea122486da
共有 1 个文件被更改,包括 4 次插入2 次删除
  1. 4 2
      src/Extracting/ParsesValidationRules.php

+ 4 - 2
src/Extracting/ParsesValidationRules.php

@@ -772,9 +772,11 @@ trait ParsesValidationRules
         // For rules that validate subfields
         $description = str_replace("The :attribute field ", "This field ", $description);
 
+        $description = preg_replace("/(?!<\W):attribute\b/", "value", $description);
+
         return str_replace(
-            [" :attribute ", "The value must ", " 1 characters", " 1 digits", " 1 kilobytes"],
-            [" value ", "Must ", " 1 character", " 1 digit", " 1 kilobyte"],
+            ["The value must ", " 1 characters", " 1 digits", " 1 kilobytes"],
+            ["Must ", " 1 character", " 1 digit", " 1 kilobyte"],
             $description
         );
     }