Skip to content

Commit da4d4a4

Browse files
committed
remove commas from values
1 parent d90611b commit da4d4a4

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/Illuminate/Validation/Rules/Unique.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ public function ignore($id, $idColumn = null)
3535
return $this->ignoreModel($id, $idColumn);
3636
}
3737

38-
$this->ignore = $id;
39-
$this->idColumn = $idColumn ?? 'id';
38+
$this->ignore = str_replace(',', '', $id);
39+
$this->idColumn = str_replace(',', '', $idColumn ?? 'id');
4040

4141
return $this;
4242
}
@@ -50,8 +50,8 @@ public function ignore($id, $idColumn = null)
5050
*/
5151
public function ignoreModel($model, $idColumn = null)
5252
{
53-
$this->idColumn = $idColumn ?? $model->getKeyName();
54-
$this->ignore = $model->{$this->idColumn};
53+
$this->idColumn = str_replace(',', '', $idColumn ?? $model->getKeyName());
54+
$this->ignore = str_replace(',', '', $model->{$this->idColumn});
5555

5656
return $this;
5757
}

tests/Validation/ValidationUniqueRuleTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function testItCorrectlyFormatsAStringVersionOfTheRule()
1717
$rule = new Unique('table', 'column');
1818
$rule->ignore('Taylor, Otwell', 'id_column');
1919
$rule->where('foo', 'bar');
20-
$this->assertEquals('unique:table,column,"Taylor, Otwell",id_column,foo,bar', (string) $rule);
20+
$this->assertEquals('unique:table,column,"Taylor Otwell",id_column,foo,bar', (string) $rule);
2121

2222
$rule = new Unique('table', 'column');
2323
$rule->ignore(null, 'id_column');

0 commit comments

Comments
 (0)