diff --git a/library/Message/Renderer.php b/library/Message/Renderer.php index 13656434..e5507035 100644 --- a/library/Message/Renderer.php +++ b/library/Message/Renderer.php @@ -13,5 +13,5 @@ use Respect\Validation\Result; interface Renderer { - public function render(Result $result, Translator $translator, string|null $template = null): string; + public function render(Result $result, Translator $translator): string; } diff --git a/library/Message/StandardRenderer.php b/library/Message/StandardRenderer.php index 890ebc1f..343c54d1 100644 --- a/library/Message/StandardRenderer.php +++ b/library/Message/StandardRenderer.php @@ -33,7 +33,7 @@ final class StandardRenderer implements Renderer ) { } - public function render(Result $result, Translator $translator, string|null $template = null): string + public function render(Result $result, Translator $translator): string { $parameters = $result->parameters; $parameters['path'] = $result->path !== null ? Quoted::fromPath($result->path) : null; @@ -51,7 +51,7 @@ final class StandardRenderer implements Renderer return $this->placeholder($matches[1], $parameters[$matches[1]], $translator, $matches[3] ?? null); }, - $translator->translate($template ?? $this->getTemplateMessage($result)), + $translator->translate($this->getTemplateMessage($result)), ); if (!$result->hasCustomTemplate() && $result->adjacent !== null) { diff --git a/tests/library/Message/TestingMessageRenderer.php b/tests/library/Message/TestingMessageRenderer.php index 4e0da72e..4f75a0fc 100644 --- a/tests/library/Message/TestingMessageRenderer.php +++ b/tests/library/Message/TestingMessageRenderer.php @@ -15,8 +15,8 @@ use Respect\Validation\Result; final class TestingMessageRenderer implements Renderer { - public function render(Result $result, Translator $translator, string|null $template = null): string + public function render(Result $result, Translator $translator): string { - return $template ?? $result->template; + return $result->template; } } diff --git a/tests/unit/Message/StandardRendererTest.php b/tests/unit/Message/StandardRendererTest.php index 0d77cda2..6f206052 100644 --- a/tests/unit/Message/StandardRendererTest.php +++ b/tests/unit/Message/StandardRendererTest.php @@ -32,18 +32,6 @@ final class StandardRendererTest extends TestCase self::assertSame($result->template, $renderer->render($result, new DummyTranslator())); } - #[Test] - public function itShouldRenderResultOverwritingCustomTemplateWhenTemplateIsPassedAsAnArgument(): void - { - $renderer = new StandardRenderer(new TestingStringifier()); - - $template = 'This is my brand new template'; - - $result = (new ResultBuilder())->template('This is my template')->build(); - - self::assertSame($template, $renderer->render($result, new DummyTranslator(), $template)); - } - #[Test] public function itShouldRenderResultProcessingParametersInTheTemplate(): void {