Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3457168 by raphaelbertrand, gauravvvv, bbrala, longwave: Since twig/twig 3.9: error with "twig_escape_filter" function usage in /core/lib/Drupal/Core/Template/TwigExtension.php 

(cherry picked from commit 128310c8c9)
merge-requests/9680/head
catch 2024-09-28 10:40:19 +02:00
parent f3d6416752
commit e51c4c7178
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/lib/Drupal/Core/Template/TwigExtension.php
View File

@ -23,6 +23,7 @@ use Twig\Node\Expression\ConstantExpression;
use Twig\Node\Node;
use Twig\TwigFilter;
use Twig\TwigFunction;
use Twig\Runtime\EscaperRuntime;
/**
* A class providing Drupal Twig extensions.
@ -461,7 +462,7 @@ class TwigExtension extends AbstractExtension {
if ($strategy == 'html') {
return Html::escape($return);
}
return twig_escape_filter($env, $return, $strategy, $charset, $autoescape);
return $env->getRuntime(EscaperRuntime::class)->escape($arg, $strategy, $charset, $autoescape);
}
// This is a normal render array, which is safe by definition, with

13
core/modules/system/tests/src/Functional/Theme/TwigExtensionTest.php
View File

@ -126,4 +126,17 @@ class TwigExtensionTest extends BrowserTestBase {
}
/**
* Test if Drupal html strategy is done and the fallback to Twig itself works.
*/
public function testRenderStrategies(): void {
/** @var \Drupal\Core\Template\TwigExtension $extension */
$extension = \Drupal::service('twig.extension');
/** @var \Drupal\Core\Template\TwigEnvironment $twig */
$twig = \Drupal::service('twig');
$this->assertSame('test&', $extension->escapeFilter($twig, 'test&'), 'TwigExtension::escapeFilter() renders escaped & when strategy is html (default).');
$this->assertSame('test\u0026', $extension->escapeFilter($twig, 'test&', 'js'), 'TwigExtension::escapeFilter() renders escaped & when strategy is js.');
}
}