determine model key name correctly

Author: taylorotwell

Diff for: src/Illuminate/Validation/Concerns/ValidatesAttributes.php

@@ -731,17 +731,17 @@ public function validateUnique($attribute, $value, $parameters)
     {
         $this->requireParameterCount(1, $parameters, 'unique');
 
-        [$connection, $table] = $this->parseTable($parameters[0]);
+        [$connection, $table, $idColumn] = $this->parseTable($parameters[0]);
 
         // The second parameter position holds the name of the column that needs to
         // be verified as unique. If this parameter isn't specified we will just
         // assume that this column to be verified shares the attribute's name.
         $column = $this->getQueryColumn($parameters, $attribute);
 
-        [$idColumn, $id] = [null, null];
+        $id = null;
 
         if (isset($parameters[2])) {
-            [$idColumn, $id] = $this->getUniqueIds($parameters);
+            [$idColumn, $id] = $this->getUniqueIds($idColumn, $parameters);
 
             if (! is_null($id)) {
                 $id = stripslashes($id);
@@ -767,12 +767,13 @@ public function validateUnique($attribute, $value, $parameters)
     /**
      * Get the excluded ID column and value for the unique rule.
      *
+     * @param  string|null  $idColumn
      * @param  array  $parameters
      * @return array
      */
-    protected function getUniqueIds($parameters)
+    protected function getUniqueIds($idColumn, $parameters)
     {
-        $idColumn = $parameters[3] ?? 'id';
+        $idColumn = $idColumn ?? $parameters[3] ?? 'id';
 
         return [$idColumn, $this->prepareUniqueId($parameters[2])];
     }
@@ -829,11 +830,11 @@ public function parseTable($table)
             $model = new $table;
 
             $table = $model->getTable();
-
             $connection = $connection ?? $model->getConnectionName();
+            $idColumn = $model->getKeyName();
         }
 
-        return [$connection, $table];
+        return [$connection, $table, $idColumn ?? null];
     }
 
     /**

Diff for: tests/Integration/Validation/ValidatorTest.php

@@ -5,6 +5,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Str;
 use Illuminate\Tests\Integration\Database\DatabaseTestCase;
 use Illuminate\Translation\ArrayLoader;
 use Illuminate\Translation\Translator;
@@ -19,19 +20,56 @@ protected function setUp(): void
 
         Schema::create('users', function (Blueprint $table) {
             $table->increments('id');
+            $table->string('uuid');
             $table->string('first_name');
         });
 
-        User::create(['first_name' => 'John']);
-        User::create(['first_name' => 'John']);
+        User::create(['uuid' => (string) Str::uuid(), 'first_name' => 'John']);
+        User::create(['uuid' => (string) Str::uuid(), 'first_name' => 'Jim']);
     }
 
     public function testExists()
     {
-        $validator = $this->getValidator(['first_name' => ['John', 'Jim']], ['first_name' => 'exists:users']);
+        $validator = $this->getValidator(['first_name' => ['John', 'Taylor']], ['first_name' => 'exists:users']);
         $this->assertFalse($validator->passes());
     }
 
+    public function testUnique()
+    {
+        $validator = $this->getValidator(['first_name' => 'John'], ['first_name' => 'unique:'.User::class]);
+        $this->assertFalse($validator->passes());
+
+        $validator = $this->getValidator(['first_name' => 'John'], ['first_name' => 'unique:'.User::class.',first_name,1']);
+        $this->assertTrue($validator->passes());
+
+        $validator = $this->getValidator(['first_name' => 'Taylor'], ['first_name' => 'unique:'.User::class]);
+        $this->assertTrue($validator->passes());
+    }
+
+    public function testUniqueWithCustomModelKey()
+    {
+        $_SERVER['CUSTOM_MODEL_KEY_NAME'] = 'uuid';
+
+        $validator = $this->getValidator(['first_name' => 'John'], ['first_name' => 'unique:'.UserWithUuid::class]);
+        $this->assertFalse($validator->passes());
+
+        $user = UserWithUuid::where('first_name', 'John')->first();
+
+        $validator = $this->getValidator(['first_name' => 'John'], ['first_name' => 'unique:'.UserWithUuid::class.',first_name,'.$user->uuid]);
+        $this->assertTrue($validator->passes());
+
+        $validator = $this->getValidator(['first_name' => 'John'], ['first_name' => 'unique:users,first_name,'.$user->uuid.',uuid']);
+        $this->assertTrue($validator->passes());
+
+        $validator = $this->getValidator(['first_name' => 'John'], ['first_name' => 'unique:users,first_name,'.$user->uuid.',id']);
+        $this->assertFalse($validator->passes());
+
+        $validator = $this->getValidator(['first_name' => 'Taylor'], ['first_name' => 'unique:'.UserWithUuid::class]);
+        $this->assertTrue($validator->passes());
+
+        unset($_SERVER['CUSTOM_MODEL_KEY_NAME']);
+    }
+
     public function testImplicitAttributeFormatting()
     {
         $translator = new Translator(new ArrayLoader, 'en');
@@ -64,3 +102,17 @@ class User extends Model
     public $timestamps = false;
     protected $guarded = ['id'];
 }
+
+class UserWithUuid extends Model
+{
+    protected $table = 'users';
+    public $timestamps = false;
+    protected $guarded = ['id'];
+    protected $keyType = 'string';
+    public $incrementing = false;
+
+    public function getKeyName()
+    {
+        return 'uuid';
+    }
+}