[5.3] Illuminate\Validation\Rules\Unique bug fix (#16948)

* Illuminate\Validation\Rules\Unique fix * Style update * Better if statement * Fix the test * Test completion
laravel · Dec 26, 2016 · 45d8718 · 45d8718
1 parent 5e1e5fe
commit 45d8718
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/Illuminate/Validation/Rules/Unique.php b/src/Illuminate/Validation/Rules/Unique.php
@@ -173,7 +173,7 @@ public function __toString()
         return rtrim(sprintf('unique:%s,%s,%s,%s,%s',
             $this->table,
             $this->column,
-            $this->ignore ?: 'NULL',
+            $this->ignore ? '"'.$this->ignore.'"' : 'NULL',
             $this->idColumn,
             $this->formatWheres()
         ), ',');

diff --git a/tests/Validation/ValidationUniqueRuleTest.php b/tests/Validation/ValidationUniqueRuleTest.php
@@ -9,8 +9,13 @@ public function testItCorrectlyFormatsAStringVersionOfTheRule()
         $this->assertEquals('unique:table,NULL,NULL,id,foo,bar', (string) $rule);
 
         $rule = new Illuminate\Validation\Rules\Unique('table', 'column');
-        $rule->ignore(1, 'id_column');
+        $rule->ignore('Taylor, Otwell', 'id_column');
         $rule->where('foo', 'bar');
-        $this->assertEquals('unique:table,column,1,id_column,foo,bar', (string) $rule);
+        $this->assertEquals('unique:table,column,"Taylor, Otwell",id_column,foo,bar', (string) $rule);
+
+        $rule = new Illuminate\Validation\Rules\Unique('table', 'column');
+        $rule->ignore(null, 'id_column');
+        $rule->where('foo', 'bar');
+        $this->assertEquals('unique:table,column,NULL,id_column,foo,bar', (string) $rule);
     }
 }