diff --git a/core/lib/Drupal/Core/Theme/ThemeManager.php b/core/lib/Drupal/Core/Theme/ThemeManager.php index 5b37a70..f6c5714 100644 --- a/core/lib/Drupal/Core/Theme/ThemeManager.php +++ b/core/lib/Drupal/Core/Theme/ThemeManager.php @@ -7,6 +7,7 @@ namespace Drupal\Core\Theme; +use Drupal\Component\Utility\SafeStringInterface; use Drupal\Core\Render\SafeString; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\Routing\StackedRouteMatchInterface; @@ -390,7 +391,7 @@ public function render($hook, array $variables) { $output = $render_function($template_file, $variables); } - return ($output instanceof SafeString) ? $output : (string) $output; + return ($output instanceof SafeStringInterface) ? $output : (string) $output; } /** diff --git a/core/themes/engines/twig/twig.engine b/core/themes/engines/twig/twig.engine index 7f8e6eb..3f236b8 100644 --- a/core/themes/engines/twig/twig.engine +++ b/core/themes/engines/twig/twig.engine @@ -45,7 +45,7 @@ function twig_init(Extension $theme) { * @param array $variables * A keyed array of variables that will appear in the output. * - * @return string + * @return \Drupal\Component\Utility\SafeStringInterface * The output generated by the template, plus any debug information. */ function twig_render_template($template_file, array $variables) {