Merge pull request #62 from ragulka/use-str-getcsv

use str_getcsv instead of explode in Delimited rule
spatie · May 9, 2023 · 5819eb5 · 5819eb5
2 parents 43a768d + 4178cb7
commit 5819eb5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/Rules/Delimited.php b/src/Rules/Delimited.php
@@ -25,6 +25,8 @@ class Delimited implements Rule
     /** @var bool */
     protected $trimItems = true;
 
+    protected bool $asCsv = false;
+
     /** @var string */
     protected $validationMessageWord = 'item';
 
@@ -79,13 +81,20 @@ public function validationMessageWord(string $word)
         return $this;
     }
 
+    public function asCsv(): static
+    {
+        $this->asCsv = true;
+
+        return $this;
+    }
+
     public function passes($attribute, $value)
     {
         if ($this->trimItems) {
             $value = trim($value);
         }
 
-        $items = collect(explode($this->separatedBy, $value))
+        $items = collect($this->asCsv ? str_getcsv($value, $this->separatedBy) : explode($this->separatedBy, $value))
             ->filter(function ($item) {
                 return strlen((string) $item) > 0;
             });

diff --git a/tests/Rules/DelimitedTest.php b/tests/Rules/DelimitedTest.php
@@ -105,6 +105,15 @@ public function it_can_skip_trimming_items()
         $this->assertRuleFails('[email protected] , [email protected]');
     }
 
+    /** @test */
+    public function it_can_treat_input_as_csv()
+    {
+        $rule = (new Delimited('string|min:5'))->asCsv();
+
+        $this->assertTrue($rule->passes('attribute', '"Doe, John", "Doe, Jane"'));
+        $this->assertFalse($rule->passes('attribute', '"Doe", "Jane"'));
+    }
+
     /** @test */
     public function it_can_accept_a_rule_as_an_array()
     {