Html: accepts IHtmlString [Closes nette/forms#160]

Author: dg

src/Utils/Html.php

@@ -280,6 +280,7 @@ public function data(string $name, $value = null)
 
 	/**
 	 * Sets element's HTML content.
+	 * @param  IHtmlString|string
 	 * @return static
 	 * @throws Nette\InvalidArgumentException
 	 */
@@ -313,12 +314,13 @@ final public function getHtml(): string
 
 	/**
 	 * Sets element's textual content.
+	 * @param  IHtmlString|string
 	 * @return static
 	 * @throws Nette\InvalidArgumentException
 	 */
 	final public function setText($text)
 	{
-		if (!is_array($text) && !$text instanceof self) {
+		if (!$text instanceof IHtmlString) {
 			$text = htmlspecialchars((string) $text, ENT_NOQUOTES, 'UTF-8');
 		}
 		return $this->setHtml((string) $text);
@@ -336,7 +338,7 @@ final public function getText(): string
 
 	/**
 	 * Adds new element's child.
-	 * @param  Html|string  Html node or raw HTML string
+	 * @param  IHtmlString|string  Html node or raw HTML string
 	 * @return static
 	 */
 	final public function addHtml($child)
@@ -347,11 +349,12 @@ final public function addHtml($child)
 
 	/**
 	 * Appends plain-text string to element content.
+	 * @param  IHtmlString|string
 	 * @return static
 	 */
 	public function addText($text)
 	{
-		if (!$text instanceof self) {
+		if (!$text instanceof IHtmlString) {
 			$text = htmlspecialchars((string) $text, ENT_NOQUOTES, 'UTF-8');
 		}
 		return $this->insert(null, $text);
@@ -372,13 +375,14 @@ final public function create(string $name, $attrs = null)
 
 	/**
 	 * Inserts child node.
-	 * @param  Html|string $child Html node or raw HTML string
+	 * @param  IHtmlString|string $child Html node or raw HTML string
 	 * @return static
 	 * @throws Nette\InvalidArgumentException
 	 */
 	public function insert(int $index = null, $child, bool $replace = false)
 	{
-		if ($child instanceof self || is_scalar($child)) {
+		if ($child instanceof IHtmlString || is_scalar($child)) {
+			$child = $child instanceof self ? $child : (string) $child;
 			if ($index === null) { // append
 				$this->children[] = $child;
 

tests/Utils/Html.basic.phpt

@@ -112,12 +112,23 @@ test(function () { // attributes escaping
 });
 
 
+class BR implements Nette\Utils\IHtmlString
+{
+	public function __toString(): string
+	{
+		return '<br>';
+	}
+}
+
 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')));
+
+	Assert::same('<p><br></p>', (string) Html::el('p')->setText(new BR));
+	Assert::same('<p><br></p>', (string) Html::el('p')->setHtml(new BR));
 });
 
 
@@ -127,6 +138,9 @@ test(function () { // addText vs. addHtml
 
 	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')));
+
+	Assert::same('<p><br></p>', (string) Html::el('p')->addText(new BR));
+	Assert::same('<p><br></p>', (string) Html::el('p')->addHtml(new BR));
 });