fix: unnecessary required rule hides real validation message

blomstra · Aug 15, 2023 · 96952b4 · 96952b4
1 parent c1e4ec3
commit 96952b4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/Listeners/AddValidatorRule.php b/src/Listeners/AddValidatorRule.php
@@ -39,7 +39,7 @@ public function __invoke(AbstractValidator $flarumValidator, Validator $validato
 
         $validator->addExtension(
             'turnstile',
-            function ($attribute, $value, $parameters) use ($secret) {
+            function ($attribute, $value) use ($secret) {
                 if (! is_string($value) || ! is_string($secret)) {
                     return false;
                 }
@@ -50,13 +50,13 @@ function ($attribute, $value, $parameters) use ($secret) {
 
         if ($flarumValidator instanceof LogInValidator && $this->settings->get('blomstra-turnstile.signin')) {
             $validator->addRules([
-                'turnstileToken' => ['required', 'turnstile'],
+                'turnstileToken' => ['turnstile'],
             ]);
         }
 
         if ($flarumValidator instanceof ForgotPasswordValidator && $this->settings->get('blomstra-turnstile.forgot')) {
             $validator->addRules([
-                'turnstileToken' => ['required', 'turnstile'],
+                'turnstileToken' => ['turnstile'],
             ]);
         }
     }

diff --git a/src/Turnstile/Turnstile.php b/src/Turnstile/Turnstile.php
@@ -39,7 +39,7 @@ public function __construct(string $secretKey)
      * array this returns.
      *
      * @param string $response
-     * @return void
+     * @return array
      */
     public function verify(string $response)
     {

diff --git a/src/Validator/TurnstileValidator.php b/src/Validator/TurnstileValidator.php
@@ -19,6 +19,6 @@ class TurnstileValidator extends AbstractValidator
      * {@inheritdoc}
      */
     protected $rules = [
-        'turnstile' => ['required', 'turnstile'],
+        'turnstile' => ['turnstile'],
     ];
 }