From da4d4a468eee174bd619b4a04aab57e419d10ff4 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 19 Mar 2019 07:14:53 -0700 Subject: [PATCH] remove commas from values --- src/Illuminate/Validation/Rules/Unique.php | 8 ++++---- tests/Validation/ValidationUniqueRuleTest.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Illuminate/Validation/Rules/Unique.php b/src/Illuminate/Validation/Rules/Unique.php index bce18d8d0871..425d690b7bf3 100644 --- a/src/Illuminate/Validation/Rules/Unique.php +++ b/src/Illuminate/Validation/Rules/Unique.php @@ -35,8 +35,8 @@ public function ignore($id, $idColumn = null) return $this->ignoreModel($id, $idColumn); } - $this->ignore = $id; - $this->idColumn = $idColumn ?? 'id'; + $this->ignore = str_replace(',', '', $id); + $this->idColumn = str_replace(',', '', $idColumn ?? 'id'); return $this; } @@ -50,8 +50,8 @@ public function ignore($id, $idColumn = null) */ public function ignoreModel($model, $idColumn = null) { - $this->idColumn = $idColumn ?? $model->getKeyName(); - $this->ignore = $model->{$this->idColumn}; + $this->idColumn = str_replace(',', '', $idColumn ?? $model->getKeyName()); + $this->ignore = str_replace(',', '', $model->{$this->idColumn}); return $this; } diff --git a/tests/Validation/ValidationUniqueRuleTest.php b/tests/Validation/ValidationUniqueRuleTest.php index d6b64b727d4f..d955e189a7cf 100644 --- a/tests/Validation/ValidationUniqueRuleTest.php +++ b/tests/Validation/ValidationUniqueRuleTest.php @@ -17,7 +17,7 @@ public function testItCorrectlyFormatsAStringVersionOfTheRule() $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('unique:table,column,"Taylor Otwell",id_column,foo,bar', (string) $rule); $rule = new Unique('table', 'column'); $rule->ignore(null, 'id_column');