diff --git a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
index 6b9525e..cb09022 100644
--- a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
+++ b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
@@ -200,6 +200,20 @@ public function testSafeJoin() {
];
$result = $twig_extension->safeJoin($twig_environment, $items, '
');
$this->assertEquals('<em>will be escaped</em>
will be markup
will be rendered', $result);
+
+ // Ensure safe_join Twig filter supports Traversable variables.
+ $items = new \ArrayObject([
+ 'will be escaped',
+ $markup,
+ ['#markup' => 'will be rendered'],
+ ]);
+ $result = $twig_extension->safeJoin($twig_environment, $items, ', ');
+ $this->assertEquals('<em>will be escaped</em>, will be markup, will be rendered', $result);
+
+ // Ensure safe_join Twig filter supports empty variables.
+ $items = NULL;
+ $result = $twig_extension->safeJoin($twig_environment, $items, '
');
+ $this->assertEmpty($result);
}
/**