Html::addText() accepts Html as setText() does

Author: dg

src/Utils/Html.php

@@ -349,9 +349,11 @@ final public function addHtml($child)
 	 * Appends plain-text string to element content.
 	 * @return static
 	 */
-	public function addText(string $text)
+	public function addText($text)
 	{
-		$text = htmlspecialchars($text, ENT_NOQUOTES, 'UTF-8');
+		if (!$text instanceof self) {
+			$text = htmlspecialchars((string) $text, ENT_NOQUOTES, 'UTF-8');
+		}
 		return $this->insert(null, $text);
 	}
 

tests/Utils/Html.basic.phpt

@@ -115,6 +115,18 @@ test(function () { // attributes escaping
 test(function () { // setText vs. setHtml
 	Assert::same('<p>Hello &amp;ndash; World</p>', (string) Html::el('p')->setText('Hello &ndash; World'));
 	Assert::same('<p>Hello &ndash; World</p>', (string) Html::el('p')->setHtml('Hello &ndash; World'));
+
+	Assert::same('<p><br></p>', (string) Html::el('p')->setText(Html::el('br')));
+	Assert::same('<p><br></p>', (string) Html::el('p')->setHtml(Html::el('br')));
+});
+
+
+test(function () { // addText vs. addHtml
+	Assert::same('<p>Hello &amp;ndash; World</p>', (string) Html::el('p')->addText('Hello &ndash; World'));
+	Assert::same('<p>Hello &ndash; World</p>', (string) Html::el('p')->addHtml('Hello &ndash; World'));
+
+	Assert::same('<p><br></p>', (string) Html::el('p')->addText(Html::el('br')));
+	Assert::same('<p><br></p>', (string) Html::el('p')->addHtml(Html::el('br')));
 });