From e7d4235d01b7643f00035a40fadeabbba5345306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Barto=C5=A1?= Date: Tue, 30 Oct 2018 19:01:43 +0100 Subject: [PATCH] fixed compatibility with ITranslator (#198) --- examples/localization.php | 2 +- src/Forms/Controls/BaseControl.php | 4 ++-- tests/Forms/Controls.Button.render.phpt | 2 +- tests/Forms/Controls.Checkbox.render.phpt | 2 +- tests/Forms/Controls.CheckboxList.render.phpt | 2 +- tests/Forms/Controls.HiddenField.render.phpt | 2 +- tests/Forms/Controls.ImageButton.render.phpt | 2 +- tests/Forms/Controls.MultiSelectBox.render.phpt | 2 +- tests/Forms/Controls.RadioList.render.phpt | 2 +- tests/Forms/Controls.SelectBox.render.phpt | 2 +- tests/Forms/Controls.TextArea.render.phpt | 2 +- tests/Forms/Controls.TextInput.render.phpt | 2 +- tests/Forms/Controls.UploadControl.render.phpt | 2 +- tests/Forms/Controls.translate().phpt | 2 +- tests/Forms/Forms.renderer.translate.phpt | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/localization.php b/examples/localization.php index cafea9085..3dadf8488 100644 --- 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 index b233761b6..9b025c571 100644 --- 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 index eb32e32e0..4f10cc796 100644 --- 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 index 0209ddb5c..5981b46da 100644 --- 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 index 00f07bd59..6bf1a0a4a 100644 --- 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 index 3973c7bcf..afd617c30 100644 --- 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 index 47213a0d2..47b21eeae 100644 --- 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 index e67a2d75d..54c1e2cd6 100644 --- 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 index f691789b4..0f2f922a3 100644 --- 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 index 6c8a9e11e..9374a563f 100644 --- 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 index 9f27b6f2a..81b355a00 100644 --- 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 index 01f4b81f8..2aafca140 100644 --- 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 index 2012c9e73..516290135 100644 --- 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 index a28058a62..ebe1e1be2 100644 --- 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 index 03e4d3d9e..9a367e4ac 100644 --- 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);