From e3dfe5b2eb6da552833b3bde8f44f3b82934506b Mon Sep 17 00:00:00 2001
From: NexusNovaz <tylerstaples21@outlook.com>
Date: Tue, 22 Apr 2025 15:20:22 +0100
Subject: [PATCH 1/2] Issue #3498468: Fix placeholder syntax in
FormattableMarkup for consistency
---
core/lib/Drupal/Component/Render/FormattableMarkup.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/core/lib/Drupal/Component/Render/FormattableMarkup.php b/core/lib/Drupal/Component/Render/FormattableMarkup.php
index 26fbc0b47c60..86811a59368d 100644
--- a/core/lib/Drupal/Component/Render/FormattableMarkup.php
+++ b/core/lib/Drupal/Component/Render/FormattableMarkup.php
@@ -113,11 +113,11 @@ public function jsonSerialize(): string {
* // Wraps $some_variable in an <em> tag.
* $this->placeholderFormat('Prefix %foo', ['%foo' => $some_variable]);
* // The following are using the : placeholder inside an HTML tag.
- * $this->placeholderFormat('<a href=":foo">link text</a>, ['@foo' => $some_variable]);
- * $this->placeholderFormat('<a href=":foo" title="static text">link text</a>, ['@foo' => $some_variable]);
- * $this->placeholderFormat('<a href=":foo">@foo</a>, ['@foo' => $some_variable]);
+ * $this->placeholderFormat('<a href=":foo">link text</a>, [':foo' => $some_variable]);
+ * $this->placeholderFormat('<a href=":foo" title="static text">link text</a>, [':foo' => $some_variable]);
+ * $this->placeholderFormat('<a href=":foo">@foo</a>, [':foo' => $some_variable]);
* // Use : placeholder inside an HTML tag.
- * $this->placeholderFormat('<img src=":foo" />, ['@foo' => '/image.png']);
+ * $this->placeholderFormat('<img src=":foo" />, [':foo' => '/image.png']);
* @endcode
* The above are typical examples of using the placeholders correctly.
*
--
GitLab
From 5e7a6a9a1dda605afc5a40228689c5abfd5ab141 Mon Sep 17 00:00:00 2001
From: NexusNovaz <tylerstaples21@outlook.com>
Date: Tue, 22 Apr 2025 17:44:54 +0100
Subject: [PATCH 2/2] Issue #3498468: Fix placeholder syntax in
FormattableMarkup examples for consistency
---
core/lib/Drupal/Component/Render/FormattableMarkup.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/core/lib/Drupal/Component/Render/FormattableMarkup.php b/core/lib/Drupal/Component/Render/FormattableMarkup.php
index 86811a59368d..44e8171080ae 100644
--- a/core/lib/Drupal/Component/Render/FormattableMarkup.php
+++ b/core/lib/Drupal/Component/Render/FormattableMarkup.php
@@ -113,11 +113,11 @@ public function jsonSerialize(): string {
* // Wraps $some_variable in an <em> tag.
* $this->placeholderFormat('Prefix %foo', ['%foo' => $some_variable]);
* // The following are using the : placeholder inside an HTML tag.
- * $this->placeholderFormat('<a href=":foo">link text</a>, [':foo' => $some_variable]);
- * $this->placeholderFormat('<a href=":foo" title="static text">link text</a>, [':foo' => $some_variable]);
- * $this->placeholderFormat('<a href=":foo">@foo</a>, [':foo' => $some_variable]);
+ * $this->placeholderFormat('<a href=":foo">link text</a>', [':foo' => $some_variable]);
+ * $this->placeholderFormat('<a href=":foo" title="static text">link text</a>', [':foo' => $some_variable]);
+ * $this->placeholderFormat('<a href=":foo">link text</a>', [':foo' => $some_variable]);
* // Use : placeholder inside an HTML tag.
- * $this->placeholderFormat('<img src=":foo" />, [':foo' => '/image.png']);
+ * $this->placeholderFormat('<img src=":foo" />', [':foo' => '/image.png']);
* @endcode
* The above are typical examples of using the placeholders correctly.
*
--
GitLab