Fixes and revert to the old testcase

laravel · Mar 13, 2018 · 475c138 · 475c138
1 parent 0252d09
commit 475c138
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/Illuminate/Validation/Rules/Unique.php b/src/Illuminate/Validation/Rules/Unique.php
@@ -20,7 +20,7 @@ class Unique
      *
      * @var string
      */
-    protected $idColumn;
+    protected $idColumn = 'id';
 
     /**
      * Ignore the given ID during the unique check.
@@ -67,7 +67,7 @@ public function __toString()
             $this->table,
             $this->column,
             $this->ignore ? '"'.$this->ignore.'"' : 'NULL',
-            $this->idColumn ?? 'NULL',
+            $this->idColumn,
             $this->formatWheres()
         ), ',');
     }

diff --git a/tests/Support/framework/testing/disks/testing/letter.txt b/tests/Support/framework/testing/disks/testing/letter.txt
diff --git a/tests/Validation/ValidationUniqueRuleTest.php b/tests/Validation/ValidationUniqueRuleTest.php
@@ -11,7 +11,7 @@ public function testItCorrectlyFormatsAStringVersionOfTheRule()
     {
         $rule = new \Illuminate\Validation\Rules\Unique('table');
         $rule->where('foo', 'bar');
-        $this->assertEquals('unique:table,NULL,NULL,NULL,foo,bar', (string) $rule);
+        $this->assertEquals('unique:table,NULL,NULL,id,foo,bar', (string) $rule);
 
         $rule = new \Illuminate\Validation\Rules\Unique('table', 'column');
         $rule->ignore('Taylor, Otwell', 'id_column');