Merge pull request #8 from ash-jc-allen/fix/locale-validation-message

Fix bug that wasn't reading the `Locale` enum value correctly

Author: JonPurvis

src/Rules/Clean.php

@@ -28,7 +28,7 @@ public function validate(string $attribute, mixed $value, Closure $fail): void
             if (Str::contains(Str::lower(Str::remove($tolerated, $value)), $profanities)) {
                 $fail(trans('message'))->translate([
                     'attribute' => $attribute,
-                ], $locale);
+                ], $this->getLocaleValue($locale));
             }
         }
     }
@@ -51,15 +51,21 @@ protected function ensureLocalesAreValid(array $locales): void
     }
 
     /**
-     * Get the name of the config file for the given locale. If a Locale enum is
-     * provided, then use the underlying value.
+     * Get the locale value expressed as a string.
      */
-    protected function configFileName(string|Locale $locale): string
+    protected function getLocaleValue(string|Locale $locale): string
     {
-        $locale = $locale instanceof Locale
+        return $locale instanceof Locale
             ? $locale->value
             : $locale;
+    }
 
-        return 'profanify-' . $locale;
+    /**
+     * Get the name of the config file for the given locale. If a Locale enum is
+     * provided, then use the underlying value.
+     */
+    protected function configFileName(string|Locale $locale): string
+    {
+        return 'profanify-' . $this->getLocaleValue($locale);
     }
 }

tests/CleanTest.php

@@ -15,7 +15,8 @@
 it('fails', function ($word) {
     $v = new Validator($this->translator, ['name' => $word], ['name' => new Clean]);
 
-    expect($v->fails())->toBeTrue();
+    expect($v->fails())->toBeTrue()
+        ->and($v->errors()->all())->toBe(['The name field is not clean']);
 })->with([
     'fuck',
     'shit',
@@ -53,6 +54,13 @@
     expect($v->passes())->toBeTrue();
 })->with(Locale::cases());
 
+it('fails when using enums', function () {
+    $v = new Validator($this->translator, ['name' => 'fuck'], ['name' => new Clean([Locale::English])]);
+
+    expect($v->fails())->toBeTrue()
+        ->and($v->errors()->all())->toBe(['The name field is not clean']);
+});
+
 it('throws an exception if one of the locales is not a string or enum', function () {
     (new Validator(
         $this->translator,