From 983d2909eba04aa9c128c55f7f5652e61204e1fe Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Thu, 29 Feb 2024 00:05:27 +0000
Subject: [PATCH] Issue #3422222 by gorkagr, mstrelan, smustgrave: Wrong return
type in Renderer::ensureMarkupIsSafe()
(cherry picked from commit e65cc2e48191e3e7cb95d86736c32852be365804)
---
core/lib/Drupal/Core/Render/Renderer.php | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/core/lib/Drupal/Core/Render/Renderer.php b/core/lib/Drupal/Core/Render/Renderer.php
index 5a7fc05dd546..9ad0d34d7894 100644
--- a/core/lib/Drupal/Core/Render/Renderer.php
+++ b/core/lib/Drupal/Core/Render/Renderer.php
@@ -810,10 +810,11 @@ protected function xssFilterAdminIfUnsafe($string) {
* @param array $elements
* A render array with #markup set.
*
- * @return \Drupal\Component\Render\MarkupInterface|string
- * The escaped markup wrapped in a Markup object. If $elements['#markup']
- * is an instance of \Drupal\Component\Render\MarkupInterface, it won't be
- * escaped or filtered again.
+ * @return array
+ * The given array with the escaped markup wrapped in a Markup object.
+ * If $elements['#markup'] is an instance of
+ * \Drupal\Component\Render\MarkupInterface, it won't be escaped or filtered
+ * again.
*
* @see \Drupal\Component\Utility\Html::escape()
* @see \Drupal\Component\Utility\Xss::filter()
--
GitLab