formatting'

laravel · Mar 20, 2019 · 34759cc · 34759cc · event15 · Mar 20, 2019
1 parent 7dc58cd
commit 34759cc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Illuminate/Validation/Rules/Unique.php b/src/Illuminate/Validation/Rules/Unique.php
@@ -35,7 +35,7 @@ public function ignore($id, $idColumn = null)
             return $this->ignoreModel($id, $idColumn);
         }
 
-        $this->ignore = addslashes($id);
+        $this->ignore = $id;
         $this->idColumn = $idColumn ?? 'id';
 
         return $this;
@@ -50,7 +50,7 @@ public function ignore($id, $idColumn = null)
      */
     public function ignoreModel($model, $idColumn = null)
     {
-        $this->idColumn = addslashes($idColumn ?? $model->getKeyName());
+        $this->idColumn = $idColumn ?? $model->getKeyName();
         $this->ignore = $model->{$this->idColumn};
 
         return $this;
@@ -66,7 +66,7 @@ public function __toString()
         return rtrim(sprintf('unique:%s,%s,%s,%s,%s',
             $this->table,
             $this->column,
-            $this->ignore ? '"'.$this->ignore.'"' : 'NULL',
+            $this->ignore ? '"'.addslashes($this->ignore).'"' : 'NULL',
             $this->idColumn,
             $this->formatWheres()
         ), ',');

diff --git a/tests/Validation/ValidationUniqueRuleTest.php b/tests/Validation/ValidationUniqueRuleTest.php
@@ -19,6 +19,13 @@ public function testItCorrectlyFormatsAStringVersionOfTheRule()
         $rule->where('foo', 'bar');
         $this->assertEquals('unique:table,column,"Taylor, Otwell",id_column,foo,bar', (string) $rule);
 
+        $rule = new Unique('table', 'column');
+        $rule->ignore('Taylor, Otwell"\'..-"', 'id_column');
+        $rule->where('foo', 'bar');
+        $this->assertEquals('unique:table,column,"Taylor, Otwell\"\\\'..-\"",id_column,foo,bar', (string) $rule);
+        $this->assertEquals('Taylor, Otwell"\'..-"', stripslashes(str_getcsv('table,column,"Taylor, Otwell\"\\\'..-\"",id_column,foo,bar')[2]));
+        $this->assertEquals('id_column', stripslashes(str_getcsv('table,column,"Taylor, Otwell\"\\\'..-\"",id_column,foo,bar')[3]));
+
         $rule = new Unique('table', 'column');
         $rule->ignore(null, 'id_column');
         $rule->where('foo', 'bar');