fixed compatibility with ITranslator (#198)

nette · Nov 23, 2018 · 84b75ea · 84b75ea
1 parent 5e0e910
commit 84b75ea
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 17 deletions.
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
 		"php": ">=7.1",
 		"nette/component-model": "^3.0.0-beta2",
 		"nette/http": "^3.0.0-beta2",
-		"nette/utils": "^3.0-beta2"
+		"nette/utils": "v3.0.0-RC1"
 	},
 	"require-dev": {
 		"nette/di": "^2.4 || ~3.0.0",

diff --git a/examples/localization.php b/examples/localization.php
@@ -33,7 +33,7 @@ public function __construct(array $table)
 	/**
 	 * Translates the given string.
 	 */
-	public function translate($message, int $count = null): string
+	public function translate($message, ...$parameters): string
 	{
 		return $this->table[$message] ?? $message;
 	}

diff --git a/src/Forms/Controls/BaseControl.php b/src/Forms/Controls/BaseControl.php
@@ -397,13 +397,13 @@ public function getTranslator(): ?Nette\Localization\ITranslator
 	 * Returns translated string.
 	 * @return mixed
 	 */
-	public function translate($value, int $count = null)
+	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 Html) { // intentionally ==
-					$v = $translator->translate($v, $count);
+					$v = $translator->translate($v, ...$parameters);
 				}
 			}
 		}

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
 {
-	public function translate($s, int $count = null): string
+	public function translate($s, ...$parameters): 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
 {
-	public function translate($s, int $count = null): string
+	public function translate($s, ...$parameters): 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
 {
-	public function translate($s, int $count = null): string
+	public function translate($s, ...$parameters): 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
 {
-	public function translate($s, int $count = null): string
+	public function translate($s, ...$parameters): 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
 {
-	public function translate($s, int $count = null): string
+	public function translate($s, ...$parameters): 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
 {
-	public function translate($s, int $count = null): string
+	public function translate($s, ...$parameters): 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
 {
-	public function translate($s, int $count = null): string
+	public function translate($s, ...$parameters): 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
 {
-	public function translate($s, int $count = null): string
+	public function translate($s, ...$parameters): 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
 {
-	public function translate($s, int $count = null): string
+	public function translate($s, ...$parameters): 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
 {
-	public function translate($s, int $count = null): string
+	public function translate($s, ...$parameters): 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
 {
-	public function translate($s, int $count = null): string
+	public function translate($s, ...$parameters): 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
 {
-	public function translate($message, int $count = null): string
+	public function translate($message, ...$parameters): string
 	{
 		return is_object($message) ? get_class($message) : $message;
 	}

diff --git a/tests/Forms/Forms.renderer.translate.phpt b/tests/Forms/Forms.renderer.translate.phpt
@@ -18,7 +18,7 @@ class Translator implements ITranslator
 	public $counter = [];
 
 
-	public function translate($message, int $count = null): string
+	public function translate($message, ...$parameters): string
 	{
 		@$this->counter[$message]++; // @ intentionally
 		return strtoupper($message);