mirror of
https://github.com/twigphp/Twig.git
synced 2026-08-31 12:37:15 +00:00
bug #3548 Explicitly specify the encoding for mb_ord in JS escaper (oleg-st)
This PR was submitted for the 3.x branch but it was merged into the 1.x branch instead.
Discussion
----------
Explicitly specify the encoding for mb_ord in JS escaper
`mb_ord` should be called with the specified UTF-8 encoding to make it independent of `mb_internal_encoding`.
Related to https://github.com/twigphp/Twig/pull/3397
Commits
-------
da24c934 Explicitly specify the encoding for mb_ord in JS escaper
This commit is contained in:
@@ -1237,7 +1237,7 @@ function _twig_escape_js_callback($matches)
|
||||
return $shortMap[$char];
|
||||
}
|
||||
|
||||
$codepoint = mb_ord($char);
|
||||
$codepoint = mb_ord($char, 'UTF-8');
|
||||
if (0x10000 > $codepoint) {
|
||||
return sprintf('\u%04X', $codepoint);
|
||||
}
|
||||
|
||||
@@ -177,6 +177,22 @@ class escapingTest extends \PHPUnit\Framework\TestCase
|
||||
}
|
||||
}
|
||||
|
||||
public function testJavascriptEscapingConvertsSpecialCharsWithInternalEncoding()
|
||||
{
|
||||
$twig = new Environment($this->createMock(LoaderInterface::class));
|
||||
$previousInternalEncoding = mb_internal_encoding();
|
||||
try {
|
||||
mb_internal_encoding('ISO-8859-1');
|
||||
foreach ($this->jsSpecialChars as $key => $value) {
|
||||
$this->assertEquals($value, twig_escape_filter($twig, $key, 'js'), 'Failed to escape: ' . $key);
|
||||
}
|
||||
} finally {
|
||||
if ($previousInternalEncoding !== false) {
|
||||
mb_internal_encoding($previousInternalEncoding);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public function testJavascriptEscapingReturnsStringIfZeroLength()
|
||||
{
|
||||
$this->assertEquals('', twig_escape_filter($this->env, '', 'js'));
|
||||
|
||||
Reference in New Issue
Block a user