renamed Nette\Utils\IHtmlString -> Nette\HtmlStringable, added class alias

Author: dg

src/Utils/Html.php

@@ -10,6 +10,7 @@
 namespace Nette\Utils;
 
 use Nette;
+use Nette\HtmlStringable;
 use function is_array, is_float, is_object, is_string;
 
 
@@ -230,7 +231,7 @@
  * @method self width(?int $val)
  * @method self wrap(?string $val)
  */
-class Html implements \ArrayAccess, \Countable, \IteratorAggregate, IHtmlString
+class Html implements \ArrayAccess, \Countable, \IteratorAggregate, HtmlStringable
 {
 	use Nette\SmartObject;
 
@@ -548,7 +549,7 @@ public function data(string $name, $value = null)
 
 	/**
 	 * Sets element's HTML content.
-	 * @param  IHtmlString|string  $html
+	 * @param  HtmlStringable|string  $html
 	 * @return static
 	 */
 	final public function setHtml($html)
@@ -569,12 +570,12 @@ final public function getHtml(): string
 
 	/**
 	 * Sets element's textual content.
-	 * @param  IHtmlString|string|int|float  $text
+	 * @param  HtmlStringable|string|int|float  $text
 	 * @return static
 	 */
 	final public function setText($text)
 	{
-		if (!$text instanceof IHtmlString) {
+		if (!$text instanceof HtmlStringable) {
 			$text = htmlspecialchars((string) $text, ENT_NOQUOTES, 'UTF-8');
 		}
 		$this->children = [(string) $text];
@@ -593,7 +594,7 @@ final public function getText(): string
 
 	/**
 	 * Adds new element's child.
-	 * @param  IHtmlString|string  $child  Html node or raw HTML string
+	 * @param  HtmlStringable|string  $child  Html node or raw HTML string
 	 * @return static
 	 */
 	final public function addHtml($child)
@@ -604,12 +605,12 @@ final public function addHtml($child)
 
 	/**
 	 * Appends plain-text string to element content.
-	 * @param  IHtmlString|string|int|float  $text
+	 * @param  HtmlStringable|string|int|float  $text
 	 * @return static
 	 */
 	public function addText($text)
 	{
-		if (!$text instanceof IHtmlString) {
+		if (!$text instanceof HtmlStringable) {
 			$text = htmlspecialchars((string) $text, ENT_NOQUOTES, 'UTF-8');
 		}
 		return $this->insert(null, $text);
@@ -630,7 +631,7 @@ final public function create(string $name, $attrs = null)
 
 	/**
 	 * Inserts child node.
-	 * @param  IHtmlString|string $child Html node or raw HTML string
+	 * @param  HtmlStringable|string $child Html node or raw HTML string
 	 * @return static
 	 */
 	public function insert(?int $index, $child, bool $replace = false)

src/Utils/IHtmlString.php renamed to src/Utils/HtmlStringable.php

@@ -7,13 +7,16 @@
 
 declare(strict_types=1);
 
-namespace Nette\Utils;
+namespace Nette;
 
 
-interface IHtmlString
+interface HtmlStringable
 {
 	/**
 	 * Returns string in HTML format
 	 */
 	function __toString(): string;
 }
+
+
+interface_exists(Utils\IHtmlString::class);

src/compatibility.php

@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * This file is part of the Nette Framework (https://nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Nette\Utils {
+	if (false) {
+		/** @deprecated use Nette\HtmlStringable */
+		interface IHtmlString
+		{
+		}
+	} elseif (!interface_exists(IHtmlString::class)) {
+		class_alias(\Nette\HtmlStringable::class, IHtmlString::class);
+	}
+}

tests/Utils/Html.basic.phpt

@@ -113,7 +113,7 @@ test('attributes escaping', function () {
 });
 
 
-class BR implements Nette\Utils\IHtmlString
+class BR implements Nette\HtmlStringable
 {
 	public function __toString(): string
 	{