follow default PHP behavior and replace invalid codepoints (laravel#4…

…6914)
bert-w · May 1, 2023 · 812ef55 · 812ef55
1 parent 96f0d0e
commit 812ef55
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/Illuminate/Support/helpers.php b/src/Illuminate/Support/helpers.php
@@ -120,7 +120,7 @@ function e($value, $doubleEncode = true)
             $value = $value->value;
         }
 
-        return htmlspecialchars($value ?? '', ENT_QUOTES, 'UTF-8', $doubleEncode);
+        return htmlspecialchars($value ?? '', ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8', $doubleEncode);
     }
 }
 

diff --git a/tests/Support/SupportHelpersTest.php b/tests/Support/SupportHelpersTest.php
@@ -37,6 +37,12 @@ public function testE()
         $this->assertEquals($str, e($html));
     }
 
+    public function testEWithInvalidCodePoints()
+    {
+        $str = mb_convert_encoding('føø bar', 'ISO-8859-1', 'UTF-8');
+        $this->assertEquals('f�� bar', e($str));
+    }
+
     /**
      * @requires PHP >= 8.1
      */
-Original file line number
+Diff line change
@@ Expand Up / @@ -120,7 +120,7 @@ function e($value, $doubleEncode = true) @@
                 $value = $value->value;
             }
-            return htmlspecialchars($value ?? '', ENT_QUOTES, 'UTF-8', $doubleEncode);
+            return htmlspecialchars($value ?? '', ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8', $doubleEncode);
         }
     }
@@ Expand Down @@