deblan-mirror/respect-validation
deblan-mirror/respect-validation
1
0
Fork 0
mirror of https://github.com/Respect/Validation.git synced 2026-03-17 07:45:45 +01:00
Code Issues Projects Releases Packages Wiki Activity

Change the contract of the formatters

Browse source 
Both `ArrayFormatter` and `StringFormatter` accept an instance of the
`Translator`. Thinking about it a bit better, I realised that a
formatter might not always need a `Translator`, but it will surely need
a `Renderer`.

Besides, the `InterpolationRenderer` needs to take translation into
account, so it seems more natural to me that this is the one that will
get an instance of the `Translator`, as other implementations of the
`Renderer` might not even deal with translations.
This commit is contained in:
Henrique Moody 2025-12-21 22:22:33 +01:00
commit 644ecb5190
No known key found for this signature in database
GPG key ID: 221E9281655813A6
14 changed files with 91 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

15
library/Message/Formatter/NestedListStringFormatter.php
View file

@ -11,7 +11,6 @@ namespace Respect\Validation\Message\Formatter;
use Respect\Validation\Message\Renderer;
use Respect\Validation\Message\StringFormatter;
use Respect\Validation\Message\Translator;
use Respect\Validation\Result;
use function array_filter;
@ -26,23 +25,22 @@ use const PHP_EOL;
final readonly class NestedListStringFormatter implements StringFormatter
{
public function __construct(
private Renderer $renderer,
private TemplateResolver $templateResolver,
) {
}
/** @param array<string|int, mixed> $templates */
public function format(Result $result, array $templates, Translator $translator): string
public function format(Result $result, Renderer $renderer, array $templates): string
{
return $this->formatRecursively($result, $templates, $translator, 0);
return $this->formatRecursively($result, $renderer, $templates, 0);
}
/** @param array<string|int, mixed> $templates */
private function formatRecursively(
Result $result,
Renderer $renderer,
array $templates,
Translator $translator,
int $depth = 0,
int $depth,
Result ...$siblings,
): string {
$matchedTemplates = $this->templateResolver->selectMatches($result, $templates);
@ -55,12 +53,11 @@ final readonly class NestedListStringFormatter implements StringFormatter
$formatted .= sprintf(
'%s- %s' . PHP_EOL,
$indentation,
$this->renderer->render(
$renderer->render(
$this->templateResolver->resolve(
$result->withoutParentPath(),
$matchedTemplates,
),
$translator,
),
);
$depth++;
@ -70,8 +67,8 @@ final readonly class NestedListStringFormatter implements StringFormatter
foreach ($result->children as $child) {
$formatted .= $this->formatRecursively(
$displayedName === $child->name ? $child->withoutName() : $child,
$renderer,
$matchedTemplates,
$translator,
$depth,
...array_filter($result->children, static fn(Result $sibling) => $sibling !== $child),
);