[4.x] Allow overwriting the column for unique_user_value validation (…

…#8852) Co-authored-by: Jason Varga <[email protected]>
statamic · Oct 16, 2023 · eb1a1fc · eb1a1fc
1 parent 323fa4e
commit eb1a1fc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/Validation/UniqueUserValue.php b/src/Validation/UniqueUserValue.php
@@ -8,10 +8,12 @@ class UniqueUserValue
 {
     public function validate($attribute, $value, $parameters, $validator)
     {
-        [$except] = array_pad($parameters, 1, null);
+        [$except, $column] = array_pad($parameters, 2, null);
+
+        $column ??= $attribute;
 
         $existing = User::query()
-            ->where($attribute, $value)
+            ->where($column, $value)
             ->first();
 
         if (! $existing) {

diff --git a/tests/Validation/UniqueUserValueTest.php b/tests/Validation/UniqueUserValueTest.php
@@ -35,4 +35,15 @@ public function it_passes_when_updating()
             ['email' => 'unique_user_value:123']
         )->passes());
     }
+
+    /** @test */
+    public function it_supports_overwriting_the_column()
+    {
+        User::make()->email('[email protected]')->save();
+
+        $this->assertTrue(Validator::make(
+            ['baz' => '[email protected]'],
+            ['baz' => 'unique_user_value:null,email']
+        )->fails());
+    }
 }