fixed compatibility with ITranslator (#198)

mabar · dg · commit e7d4235d01b7 · 2018-11-23T17:45:18.000+01:00
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);

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function __construct(array $table)`
`33`	`33`	`/**`
`34`	`34`	`* Translates the given string.`
`35`	`35`	`*/`
`36`		`- public function translate($message, int $count = null): string`
	`36`	`+ public function translate($message, ...$parameters): string`
`37`	`37`	`{`
`38`	`38`	`return $this->table[$message] ?? $message;`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -397,13 +397,13 @@ public function getTranslator(): ?Nette\Localization\ITranslator`
`397`	`397`	`* Returns translated string.`
`398`	`398`	`* @return mixed`
`399`	`399`	`*/`
`400`		`- public function translate($value, int $count = null)`
	`400`	`+ public function translate($value, ...$parameters)`
`401`	`401`	`{`
`402`	`402`	`if ($translator = $this->getTranslator()) {`
`403`	`403`	`$tmp = is_array($value) ? [&$value] : [[&$value]];`
`404`	`404`	`foreach ($tmp[0] as &$v) {`
`405`	`405`	`if ($v != null && !$v instanceof Html) { // intentionally ==`
`406`		`- $v = $translator->translate($v, $count);`
	`406`	`+ $v = $translator->translate($v, ...$parameters);`
`407`	`407`	`}`
`408`	`408`	`}`
`409`	`409`	`}`
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`		`- public function translate($s, int $count = null): string`
	`19`	`+ public function translate($s, ...$parameters): string`
`20`	`20`	`{`
`21`	`21`	`return strtoupper($s);`
`22`	`22`	`}`