[10.x] Backport 11.x PHP 8.4 fix for str_getcsv deprecation (#54074)

* Backport 11.x PHP 8.4 compat fix to str_getcsv * Fix indent
laravel · Jan 6, 2025 · eacb494 · eacb494
1 parent 9cc32b5
commit eacb494
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Illuminate/Validation/ValidationRuleParser.php b/src/Illuminate/Validation/ValidationRuleParser.php
@@ -280,7 +280,7 @@ protected static function parseStringRule($rule)
      */
     protected static function parseParameters($rule, $parameter)
     {
-        return static::ruleIsRegex($rule) ? [$parameter] : str_getcsv($parameter);
+        return static::ruleIsRegex($rule) ? [$parameter] : str_getcsv($parameter, escape: '\\');
     }
 
     /**

diff --git a/tests/Validation/ValidationUniqueRuleTest.php b/tests/Validation/ValidationUniqueRuleTest.php
@@ -57,8 +57,8 @@ public function testItCorrectlyFormatsAStringVersionOfTheRule()
         $rule->ignore('Taylor, Otwell"\'..-"', 'id_column');
         $rule->where('foo', 'bar');
         $this->assertSame('unique:table,column,"Taylor, Otwell\"\\\'..-\"",id_column,foo,"bar"', (string) $rule);
-        $this->assertSame('Taylor, Otwell"\'..-"', stripslashes(str_getcsv('table,column,"Taylor, Otwell\"\\\'..-\"",id_column,foo,"bar"')[2]));
-        $this->assertSame('id_column', stripslashes(str_getcsv('table,column,"Taylor, Otwell\"\\\'..-\"",id_column,foo,"bar"')[3]));
+        $this->assertSame('Taylor, Otwell"\'..-"', stripslashes(str_getcsv('table,column,"Taylor, Otwell\"\\\'..-\"",id_column,foo,"bar"', escape: '\\')[2]));
+        $this->assertSame('id_column', stripslashes(str_getcsv('table,column,"Taylor, Otwell\"\\\'..-\"",id_column,foo,"bar"', escape: '\\')[3]));
 
         $rule = new Unique('table', 'column');
         $rule->ignore(null, 'id_column');
-Original file line number
+Diff line change
@@ Expand Up / @@ -280,7 +280,7 @@ protected static function parseStringRule($rule) @@
          */
         protected static function parseParameters($rule, $parameter)
         {
-            return static::ruleIsRegex($rule) ? [$parameter] : str_getcsv($parameter);
+            return static::ruleIsRegex($rule) ? [$parameter] : str_getcsv($parameter, escape: '\\');
         }
         /**
@@ Expand Down @@