compatibility with nette/utils 3.0

dg · dg · commit 441440cd0ea3 · 2017-01-26T00:49:54.000+01:00
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
 		"php": ">=7.1",
 		"nette/component-model": "^2.3",
 		"nette/http": "^2.2 || ~3.0.0",
-		"nette/utils": "^2.4"
+		"nette/utils": "^3.0"
 	},
 	"require-dev": {
 		"nette/di": "^2.4 || ~3.0.0",
diff --git a/examples/localization.php b/examples/localization.php
@@ -31,7 +31,7 @@ function __construct(array $table)
 	/**
 	 * Translates the given string.
 	 */
-	public function translate($message, $count = NULL)
+	public function translate($message, int $count = NULL): string
 	{
 		return $this->table[$message] ?? $message;
 	}
diff --git a/src/Forms/Form.php b/src/Forms/Form.php
@@ -644,7 +644,7 @@ public function render(...$args)
 	 * @param can throw exceptions? (hidden parameter)
 	 * @return string
 	 */
-	public function __toString()
+	public function __toString(): string
 	{
 		try {
 			$this->fireRenderEvents();
diff --git a/src/Forms/Rendering/DefaultFormRenderer.php b/src/Forms/Rendering/DefaultFormRenderer.php
@@ -423,7 +423,7 @@ public function renderLabel(Nette\Forms\IControl $control)
 		} elseif ($label != NULL) { // @intentionally ==
 			$label .= $suffix;
 		}
-		return $this->getWrapper('label container')->setHtml($label);
+		return $this->getWrapper('label container')->setHtml((string) $label);
 	}
 
 
diff --git a/tests/Forms/Controls.Button.render.phpt b/tests/Forms/Controls.Button.render.phpt
@@ -16,7 +16,7 @@ require __DIR__ . '/../bootstrap.php';
 
 class Translator implements Nette\Localization\ITranslator
 {
-	function translate($s, $plural = NULL)
+	function translate($s, int $count = NULL): string
 	{
 		return strtoupper($s);
 	}
diff --git a/tests/Forms/Controls.Checkbox.render.phpt b/tests/Forms/Controls.Checkbox.render.phpt
@@ -16,7 +16,7 @@ require __DIR__ . '/../bootstrap.php';
 
 class Translator implements Nette\Localization\ITranslator
 {
-	function translate($s, $plural = NULL)
+	function translate($s, int $count = NULL): string
 	{
 		return strtoupper($s);
 	}
diff --git a/tests/Forms/Controls.CheckboxList.render.phpt b/tests/Forms/Controls.CheckboxList.render.phpt
@@ -16,7 +16,7 @@ require __DIR__ . '/../bootstrap.php';
 
 class Translator implements Nette\Localization\ITranslator
 {
-	function translate($s, $plural = NULL)
+	function translate($s, int $count = NULL): string
 	{
 		return strtoupper($s);
 	}
diff --git a/tests/Forms/Controls.HiddenField.render.phpt b/tests/Forms/Controls.HiddenField.render.phpt
@@ -16,7 +16,7 @@ require __DIR__ . '/../bootstrap.php';
 
 class Translator implements Nette\Localization\ITranslator
 {
-	function translate($s, $plural = NULL)
+	function translate($s, int $count = NULL): string
 	{
 		return strtoupper($s);
 	}
diff --git a/tests/Forms/Controls.ImageButton.render.phpt b/tests/Forms/Controls.ImageButton.render.phpt
@@ -16,7 +16,7 @@ require __DIR__ . '/../bootstrap.php';
 
 class Translator implements Nette\Localization\ITranslator
 {
-	function translate($s, $plural = NULL)
+	function translate($s, int $count = NULL): string
 	{
 		return strtoupper($s);
 	}
diff --git a/tests/Forms/Controls.MultiSelectBox.render.phpt b/tests/Forms/Controls.MultiSelectBox.render.phpt
@@ -16,7 +16,7 @@ require __DIR__ . '/../bootstrap.php';
 
 class Translator implements Nette\Localization\ITranslator
 {
-	function translate($s, $plural = NULL)
+	function translate($s, int $count = NULL): string
 	{
 		return strtoupper($s);
 	}
diff --git a/tests/Forms/Controls.RadioList.render.phpt b/tests/Forms/Controls.RadioList.render.phpt
@@ -16,7 +16,7 @@ require __DIR__ . '/../bootstrap.php';
 
 class Translator implements Nette\Localization\ITranslator
 {
-	function translate($s, $plural = NULL)
+	function translate($s, int $count = NULL): string
 	{
 		return strtoupper($s);
 	}
diff --git a/tests/Forms/Controls.SelectBox.render.phpt b/tests/Forms/Controls.SelectBox.render.phpt
@@ -16,7 +16,7 @@ require __DIR__ . '/../bootstrap.php';
 
 class Translator implements Nette\Localization\ITranslator
 {
-	function translate($s, $plural = NULL)
+	function translate($s, int $count = NULL): string
 	{
 		return strtoupper($s);
 	}
diff --git a/tests/Forms/Controls.TextArea.render.phpt b/tests/Forms/Controls.TextArea.render.phpt
@@ -16,7 +16,7 @@ require __DIR__ . '/../bootstrap.php';
 
 class Translator implements Nette\Localization\ITranslator
 {
-	function translate($s, $plural = NULL)
+	function translate($s, int $count = NULL): string
 	{
 		return strtoupper($s);
 	}
diff --git a/tests/Forms/Controls.TextInput.render.phpt b/tests/Forms/Controls.TextInput.render.phpt
@@ -16,7 +16,7 @@ require __DIR__ . '/../bootstrap.php';
 
 class Translator implements Nette\Localization\ITranslator
 {
-	function translate($s, $plural = NULL)
+	function translate($s, int $count = NULL): string
 	{
 		return strtoupper($s);
 	}
diff --git a/tests/Forms/Controls.UploadControl.render.phpt b/tests/Forms/Controls.UploadControl.render.phpt
@@ -16,7 +16,7 @@ require __DIR__ . '/../bootstrap.php';
 
 class Translator implements Nette\Localization\ITranslator
 {
-	function translate($s, $plural = NULL)
+	function translate($s, int $count = NULL): string
 	{
 		return strtoupper($s);
 	}
diff --git a/tests/Forms/Controls.translate().phpt b/tests/Forms/Controls.translate().phpt
@@ -15,7 +15,7 @@ require __DIR__ . '/../bootstrap.php';
 
 class Translator implements \Nette\Localization\ITranslator
 {
-	function translate($message, $count = NULL)
+	function translate($message, int $count = NULL): string
 	{
 		return is_object($message) ? get_class($message) : $message;
 	}

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ function __construct(array $table)`
`31`	`31`	`/**`
`32`	`32`	`* Translates the given string.`
`33`	`33`	`*/`
`34`		`- public function translate($message, $count = NULL)`
	`34`	`+ public function translate($message, int $count = NULL): string`
`35`	`35`	`{`
`36`	`36`	`return $this->table[$message] ?? $message;`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -644,7 +644,7 @@ public function render(...$args)`
`644`	`644`	`* @param can throw exceptions? (hidden parameter)`
`645`	`645`	`* @return string`
`646`	`646`	`*/`
`647`		`- public function __toString()`
	`647`	`+ public function __toString(): string`
`648`	`648`	`{`
`649`	`649`	`try {`
`650`	`650`	`$this->fireRenderEvents();`
Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ public function renderLabel(Nette\Forms\IControl $control)`
`423`	`423`	`} elseif ($label != NULL) { // @intentionally ==`
`424`	`424`	`$label .= $suffix;`
`425`	`425`	`}`
`426`		`- return $this->getWrapper('label container')->setHtml($label);`
	`426`	`+ return $this->getWrapper('label container')->setHtml((string) $label);`
`427`	`427`	`}`
`428`	`428`
`429`	`429`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ require __DIR__ . '/../bootstrap.php';`
`16`	`16`
`17`	`17`	`class Translator implements Nette\Localization\ITranslator`
`18`	`18`	`{`
`19`		`- function translate($s, $plural = NULL)`
	`19`	`+ function translate($s, int $count = NULL): string`
`20`	`20`	`{`
`21`	`21`	`return strtoupper($s);`
`22`	`22`	`}`