requires nette/utils 3.2

nette · Dec 28, 2020 · cfc7861 · cfc7861
1 parent b7fe4d1
commit cfc7861
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 24 deletions.
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
 		"php": ">=7.2",
 		"nette/component-model": "^3.0",
 		"nette/http": "^3.0",
-		"nette/utils": "^3.0"
+		"nette/utils": "^3.2"
 	},
 	"require-dev": {
 		"nette/application": "^3.0",

diff --git a/examples/localization.php b/examples/localization.php
@@ -19,7 +19,7 @@
 Debugger::enable();
 
 
-class MyTranslator implements Nette\Localization\ITranslator
+class MyTranslator implements Nette\Localization\Translator
 {
 	private $table;
 

diff --git a/src/Forms/ControlGroup.php b/src/Forms/ControlGroup.php
@@ -81,10 +81,10 @@ public function getControls(): array
 	/**
 	 * Sets user-specific option.
 	 * Options recognized by DefaultFormRenderer
-	 * - 'label' - textual or IHtmlString object label
+	 * - 'label' - textual or Nette\HtmlStringable object label
 	 * - 'visual' - indicates visual group
 	 * - 'container' - container as Html object
-	 * - 'description' - textual or IHtmlString object description
+	 * - 'description' - textual or Nette\HtmlStringable object description
 	 * - 'embedNext' - describes how render next group
 	 *
 	 * @return static

diff --git a/src/Forms/Controls/BaseControl.php b/src/Forms/Controls/BaseControl.php
@@ -68,7 +68,7 @@ abstract class BaseControl extends Nette\ComponentModel\Component implements Con
 	/** @var Rules */
 	private $rules;
 
-	/** @var Nette\Localization\ITranslator|bool|null */
+	/** @var Nette\Localization\Translator|bool|null */
 	private $translator = true; // means autodetect
 
 	/** @var array user options */
@@ -275,7 +275,7 @@ public function getLabel($caption = null)
 		$label->for = $this->getHtmlId();
 		$caption = $caption ?? $this->caption;
 		$translator = $this->getForm()->getTranslator();
-		$label->setText($translator && !$caption instanceof Nette\Utils\IHtmlString ? $translator->translate($caption) : $caption);
+		$label->setText($translator && !$caption instanceof Nette\HtmlStringable ? $translator->translate($caption) : $caption);
 		return $label;
 	}
 
@@ -376,7 +376,7 @@ public function setAttribute(string $name, $value = true)
 	 * Sets translate adapter.
 	 * @return static
 	 */
-	public function setTranslator(?Nette\Localization\ITranslator $translator)
+	public function setTranslator(?Nette\Localization\Translator $translator)
 	{
 		$this->translator = $translator;
 		return $this;
@@ -386,7 +386,7 @@ public function setTranslator(?Nette\Localization\ITranslator $translator)
 	/**
 	 * Returns translate adapter.
 	 */
-	public function getTranslator(): ?Nette\Localization\ITranslator
+	public function getTranslator(): ?Nette\Localization\Translator
 	{
 		if ($this->translator === true) {
 			return $this->getForm(false)
@@ -406,7 +406,7 @@ public function translate($value, ...$parameters)
 		if ($translator = $this->getTranslator()) {
 			$tmp = is_array($value) ? [&$value] : [[&$value]];
 			foreach ($tmp[0] as &$v) {
-				if ($v != null && !$v instanceof Nette\Utils\IHtmlString) { // intentionally ==
+				if ($v != null && !$v instanceof Nette\HtmlStringable) { // intentionally ==
 					$v = $translator->translate($v, ...$parameters);
 				}
 			}

diff --git a/src/Forms/Form.php b/src/Forms/Form.php
@@ -23,7 +23,7 @@
  * @property string $action
  * @property string $method
  */
-class Form extends Container implements Nette\Utils\IHtmlString
+class Form extends Container implements Nette\HtmlStringable
 {
 	/** validator */
 	public const
@@ -108,7 +108,7 @@ class Form extends Container implements Nette\Utils\IHtmlString
 	/** @var FormRenderer */
 	private $renderer;
 
-	/** @var Nette\Localization\ITranslator */
+	/** @var Nette\Localization\Translator */
 	private $translator;
 
 	/** @var ControlGroup[] */
@@ -296,7 +296,7 @@ public function getGroup($name): ?ControlGroup
 	 * Sets translate adapter.
 	 * @return static
 	 */
-	public function setTranslator(?Nette\Localization\ITranslator $translator)
+	public function setTranslator(?Nette\Localization\Translator $translator)
 	{
 		$this->translator = $translator;
 		return $this;
@@ -306,7 +306,7 @@ public function setTranslator(?Nette\Localization\ITranslator $translator)
 	/**
 	 * Returns translate adapter.
 	 */
-	public function getTranslator(): ?Nette\Localization\ITranslator
+	public function getTranslator(): ?Nette\Localization\Translator
 	{
 		return $this->translator;
 	}

diff --git a/src/Forms/Helpers.php b/src/Forms/Helpers.php
@@ -119,7 +119,7 @@ public static function exportRules(Rules $rules): array
 				}
 			} else {
 				$msg = Validator::formatMessage($rule, false);
-				if ($msg instanceof Nette\Utils\IHtmlString) {
+				if ($msg instanceof Nette\HtmlStringable) {
 					$msg = html_entity_decode(strip_tags((string) $msg), ENT_QUOTES | ENT_HTML5, 'UTF-8');
 				}
 				$item = ['op' => ($rule->isNegative ? '~' : '') . $op, 'msg' => $msg];
@@ -168,7 +168,7 @@ public static function createInputList(
 			$res .= ($res === '' && $wrapperEnd === '' ? '' : $wrapper)
 				. $labelTag . $label->attributes() . '>'
 				. $inputTag . $input->attributes() . (Html::$xhtml ? ' />' : '>')
-				. ($caption instanceof Nette\Utils\IHtmlString ? $caption : htmlspecialchars((string) $caption, ENT_NOQUOTES, 'UTF-8'))
+				. ($caption instanceof Nette\HtmlStringable ? $caption : htmlspecialchars((string) $caption, ENT_NOQUOTES, 'UTF-8'))
 				. '</label>'
 				. $wrapperEnd;
 		}

diff --git a/src/Forms/Rendering/DefaultFormRenderer.php b/src/Forms/Rendering/DefaultFormRenderer.php
@@ -11,7 +11,7 @@
 
 use Nette;
 use Nette\Utils\Html;
-use Nette\Utils\IHtmlString;
+use Nette\HtmlStringable;
 
 
 /**
@@ -232,7 +232,7 @@ private function doRenderErrors(array $errors, bool $control): string
 
 		foreach ($errors as $error) {
 			$item = clone $item;
-			if ($error instanceof IHtmlString) {
+			if ($error instanceof HtmlStringable) {
 				$item->addHtml($error);
 			} else {
 				$item->setText($error);
@@ -274,7 +274,7 @@ public function renderBody(): string
 			$s .= "\n" . $container->startTag();
 
 			$text = $group->getOption('label');
-			if ($text instanceof IHtmlString) {
+			if ($text instanceof HtmlStringable) {
 				$s .= $this->getWrapper('group label')->addHtml($text);
 
 			} elseif ($text != null) { // intentionally ==
@@ -285,7 +285,7 @@ public function renderBody(): string
 			}
 
 			$text = $group->getOption('description');
-			if ($text instanceof IHtmlString) {
+			if ($text instanceof HtmlStringable) {
 				$s .= $text;
 
 			} elseif ($text != null) { // intentionally ==
@@ -389,7 +389,7 @@ public function renderPairMulti(array $controls): string
 				throw new Nette\InvalidArgumentException('Argument must be array of Nette\Forms\IControl instances.');
 			}
 			$description = $control->getOption('description');
-			if ($description instanceof IHtmlString) {
+			if ($description instanceof HtmlStringable) {
 				$description = ' ' . $description;
 
 			} elseif ($description != null) { // intentionally ==
@@ -453,7 +453,7 @@ public function renderControl(Nette\Forms\Control $control): Html
 		}
 
 		$description = $control->getOption('description');
-		if ($description instanceof IHtmlString) {
+		if ($description instanceof HtmlStringable) {
 			$description = ' ' . $description;
 
 		} elseif ($description != null) { // intentionally ==

diff --git a/src/Forms/Validator.php b/src/Forms/Validator.php
@@ -48,13 +48,13 @@ class Validator
 
 
 	/**
-	 * @return string|Nette\Utils\IHtmlString
+	 * @return string|Nette\HtmlStringable
 	 * @internal
 	 */
 	public static function formatMessage(Rule $rule, bool $withValue = true)
 	{
 		$message = $rule->message;
-		if ($message instanceof Nette\Utils\IHtmlString) {
+		if ($message instanceof Nette\HtmlStringable) {
 			return $message;
 
 		} elseif ($message === null && is_string($rule->validator) && isset(static::$messages[$rule->validator])) {
@@ -75,7 +75,7 @@ public static function formatMessage(Rule $rule, bool $withValue = true)
 				case 'label':
 					if ($rule->control instanceof Controls\BaseControl) {
 						$caption = $rule->control->getCaption();
-						$caption = $caption instanceof Nette\Utils\IHtmlString
+						$caption = $caption instanceof Nette\HtmlStringable
 							? $caption->getText()
 							: ($translator ? $translator->translate($caption) : $caption);
 						return rtrim((string) $caption, ':');