compatible with nette/utils v3

dg · dg · commit 9e94222a0c14 · 2017-01-13T08:53:58.000+01:00
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
 		"php": ">=7.0",
 		"nette/component-model": "~2.3",
 		"nette/http": "~2.2",
-		"nette/utils": "~2.4"
+		"nette/utils": "~3.0"
 	},
 	"require-dev": {
 		"nette/di": "~2.4",
diff --git a/examples/localization.php b/examples/localization.php
@@ -29,7 +29,7 @@ function __construct(array $table)
 	/**
 	 * Translates the given string.
 	 */
-	public function translate($message, $count = NULL)
+	public function translate($message, int $count = NULL): string
 	{
 		return isset($this->table[$message]) ? $this->table[$message] : $message;
 	}
diff --git a/src/Forms/Form.php b/src/Forms/Form.php
@@ -639,7 +639,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
@@ -421,7 +421,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
@@ -14,7 +14,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
@@ -14,7 +14,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
@@ -14,7 +14,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
@@ -14,7 +14,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
@@ -14,7 +14,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
@@ -14,7 +14,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
@@ -14,7 +14,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
@@ -14,7 +14,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
@@ -14,7 +14,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
@@ -14,7 +14,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
@@ -14,7 +14,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
@@ -13,7 +13,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
`@@ -29,7 +29,7 @@ function __construct(array $table)`
`29`	`29`	`/**`
`30`	`30`	`* Translates the given string.`
`31`	`31`	`*/`
`32`		`- public function translate($message, $count = NULL)`
	`32`	`+ public function translate($message, int $count = NULL): string`
`33`	`33`	`{`
`34`	`34`	`return isset($this->table[$message]) ? $this->table[$message] : $message;`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -639,7 +639,7 @@ public function render(...$args)`
`639`	`639`	`* @param can throw exceptions? (hidden parameter)`
`640`	`640`	`* @return string`
`641`	`641`	`*/`
`642`		`- public function __toString()`
	`642`	`+ public function __toString(): string`
`643`	`643`	`{`
`644`	`644`	`try {`
`645`	`645`	`$this->fireRenderEvents();`
Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,7 @@ public function renderLabel(Nette\Forms\IControl $control)`
`421`	`421`	`} elseif ($label != NULL) { // @intentionally ==`
`422`	`422`	`$label .= $suffix;`
`423`	`423`	`}`
`424`		`- return $this->getWrapper('label container')->setHtml($label);`
	`424`	`+ return $this->getWrapper('label container')->setHtml((string) $label);`
`425`	`425`	`}`
`426`	`426`
`427`	`427`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ require __DIR__ . '/../bootstrap.php';`
`14`	`14`
`15`	`15`	`class Translator implements Nette\Localization\ITranslator`
`16`	`16`	`{`
`17`		`- function translate($s, $plural = NULL)`
	`17`	`+ function translate($s, int $count = NULL): string`
`18`	`18`	`{`
`19`	`19`	`return strtoupper($s);`
`20`	`20`	`}`