Skip to content

Commit 25cdef8

Browse files
henriquemoodyhenriquemoody
committed
Use Subject to track pairs of Name and Path 
1 parent 94ddfcd commit 25cdef8

File tree

12 files changed

+139
-102
lines changed

12 files changed

+139
-102
lines changed

‎library/Message/Formatter/FirstResultStringFormatter.php‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,19 @@
1111

1212
use Respect\Validation\Message\Renderer;
1313
use Respect\Validation\Message\StringFormatter;
14-
use Respect\Validation\Name;
1514
use Respect\Validation\Result;
1615

1716
final readonly class FirstResultStringFormatter implements StringFormatter
1817
{
1918
/** @param array<string|int, mixed> $templates */
2019
public function format(Result $result, Renderer $renderer, array $templates): string
21-
{
22-
return $this->formatResult($result, $renderer, $templates, null);
23-
}
24-
25-
/** @param array<string|int, mixed> $templates */
26-
private function formatResult(Result $result, Renderer $renderer, array $templates, Name|null $parentName): string
2720
{
2821
if (!$result->hasCustomTemplate()) {
2922
foreach ($result->children as $child) {
30-
return $this->formatResult($child, $renderer, $templates, $result->name ?? $parentName);
23+
return $this->format($child, $renderer, $templates);
3124
}
3225
}
3326

34-
if ($parentName !== null) {
35-
$result = $result->withName($parentName);
36-
}
37-
3827
return $renderer->render($result, $templates);
3928
}
4029
}

‎library/Message/Formatter/NestedArrayFormatter.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ public function format(Result $result, Renderer $renderer, array $templates): ar
2727
{
2828
if (count($result->children) === 0) {
2929
return [
30-
$result->path->value ?? $result->id->value => $renderer->render($result, $templates),
30+
$result->subject->path->value ?? $result->id->value => $renderer->render($result, $templates),
3131
];
3232
}
3333

3434
$messages = [];
3535
foreach ($result->children as $child) {
36-
$key = $child->path->value ?? $child->id->value;
36+
$key = $child->subject->path->value ?? $child->id->value;
3737
$messages[$key] = $this->format(
3838
$child->withoutName(),
3939
$renderer,

‎library/Message/Formatter/NestedListStringFormatter.php‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
use Respect\Validation\Message\Renderer;
1313
use Respect\Validation\Message\StringFormatter;
14+
use Respect\Validation\Name;
1415
use Respect\Validation\Result;
1516

1617
use function array_filter;
@@ -27,7 +28,7 @@
2728
/** @param array<string|int, mixed> $templates */
2829
public function format(Result $result, Renderer $renderer, array $templates): string
2930
{
30-
return $this->formatRecursively($result, $renderer, $templates, 0);
31+
return $this->formatRecursively($result, $renderer, $templates, 0, null);
3132
}
3233

3334
/** @param array<string|int, mixed> $templates */
@@ -36,23 +37,31 @@ private function formatRecursively(
3637
Renderer $renderer,
3738
array $templates,
3839
int $depth,
40+
Name|null $displayedName,
3941
Result ...$siblings,
4042
): string {
4143
$formatted = '';
42-
$displayedName = null;
4344
if ($this->isVisible($result, ...$siblings)) {
4445
$indentation = str_repeat(' ', $depth * 2);
45-
$displayedName = $result->name;
46-
$formatted .= sprintf('%s- %s' . PHP_EOL, $indentation, $renderer->render($result, $templates));
46+
$formatted .= sprintf(
47+
'%s- %s' . PHP_EOL,
48+
$indentation,
49+
$renderer->render(
50+
$displayedName === $result->subject->name ? $result->withoutName() : $result,
51+
$templates,
52+
),
53+
);
54+
$displayedName ??= $result->subject->name;
4755
$depth++;
4856
}
4957

5058
foreach ($result->children as $child) {
5159
$formatted .= $this->formatRecursively(
52-
$displayedName === $child->name ? $child->withoutName() : $child,
60+
$child,
5361
$renderer,
5462
$templates,
5563
$depth,
64+
$displayedName,
5665
...array_filter($result->children, static fn(Result $sibling) => $sibling !== $child),
5766
);
5867
$formatted .= PHP_EOL;

‎library/Message/Formatter/TemplateResolver.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ public function getGivenTemplate(Result $result, array $templates): string|null
3232
return $result->template;
3333
}
3434

35-
if ($result->path !== null) {
36-
$templates = $this->filterByPath($result->path, $templates);
35+
if ($result->subject->path !== null) {
36+
$templates = $this->filterByPath($result->subject->path, $templates);
3737
}
3838

39-
foreach ([$result->path?->value, $result->name?->value, $result->id->value, '__root__'] as $key) {
39+
foreach ([$result->subject->path?->value, $result->subject->name?->value, $result->id->value, '__root__'] as $key) {
4040
if ($key === null || !isset($templates[$key])) {
4141
continue;
4242
}

‎library/Message/InterpolationRenderer.php‎

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
use Respect\Validation\Message\Formatter\TemplateResolver;
1414
use Respect\Validation\Message\Placeholder\Listed;
1515
use Respect\Validation\Message\Placeholder\Quoted;
16-
use Respect\Validation\Name;
1716
use Respect\Validation\Result;
17+
use Respect\Validation\Subject;
1818

1919
use function array_key_exists;
2020
use function is_array;
@@ -36,7 +36,7 @@ public function __construct(
3636
/** @param array<string|int, mixed> $templates */
3737
public function render(Result $result, array $templates): string
3838
{
39-
$parameters = ['path' => $result->path, 'input' => $result->input, 'subject' => $this->getName($result)];
39+
$parameters = $this->getParameters($result->subject);
4040
$parameters += $result->parameters;
4141

4242
$givenTemplate = $this->templateResolver->getGivenTemplate($result, $templates);
@@ -89,24 +89,9 @@ private function placeholder(
8989
return $this->stringifier->stringify($value, 0) ?? print_r($value, true);
9090
}
9191

92-
private function getName(Result $result): mixed
92+
/** @return array<string, mixed> */
93+
private function getParameters(Subject $subject): array
9394
{
94-
if (array_key_exists('name', $result->parameters) && is_string($result->parameters['name'])) {
95-
return new Name($result->parameters['name']);
96-
}
97-
98-
if (array_key_exists('name', $result->parameters)) {
99-
return $result->parameters['name'];
100-
}
101-
102-
if ($result->name !== null) {
103-
return $result->name;
104-
}
105-
106-
if ($result->path?->value !== null) {
107-
return $result->path;
108-
}
109-
110-
return $result->input;
95+
return ['path' => $subject->path, 'input' => $subject->input, 'subject' => $subject];
11196
}
11297
}

‎library/Message/Stringifier/NameStringifier.php‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
namespace Respect\Validation\Message\Stringifier;
1111

1212
use Respect\Stringifier\Stringifier;
13-
use Respect\Validation\Name;
13+
use Respect\Validation\Subject;
1414

1515
use function sprintf;
1616

@@ -23,18 +23,26 @@ public function __construct(
2323

2424
public function stringify(mixed $raw, int $depth): string|null
2525
{
26-
if (!$raw instanceof Name) {
26+
if (!$raw instanceof Subject) {
2727
return null;
2828
}
2929

30-
if ($raw->path === null) {
31-
return $raw->value;
30+
if ($raw->path === null && $raw->name === null) {
31+
return $this->stringifier->stringify($raw->input, $depth);
32+
}
33+
34+
if ($raw->name === null) {
35+
return $this->stringifier->stringify($raw->path, $depth);
36+
}
37+
38+
if ($raw->path === null || $raw->isNamePrin === true) {
39+
return $raw->name->value;
3240
}
3341

3442
return sprintf(
3543
'%s (<- %s)',
3644
$this->stringifier->stringify($raw->path, $depth),
37-
$raw->value,
45+
$raw->name->value,
3846
);
3947
}
4048
}

‎library/Name.php‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@
1313
{
1414
public function __construct(
1515
public string $value,
16-
public Path|null $path = null,
1716
) {
1817
}
19-
20-
public function withPath(Path $path): Name
21-
{
22-
return new self($this->value, $path);
23-
}
2418
}

‎library/Result.php‎

Lines changed: 17 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,13 @@
2424
/** @param array<string, mixed> $parameters */
2525
public function __construct(
2626
public bool $hasPassed,
27-
public mixed $input,
27+
public Subject $subject,
2828
public Rule $rule,
2929
public Id $id,
3030
public array $parameters = [],
3131
public string $template = Rule::TEMPLATE_STANDARD,
3232
public bool $hasInvertedMode = false,
33-
public Name|null $name = null,
3433
public Result|null $adjacent = null,
35-
public Path|null $path = null,
3634
Result ...$children,
3735
) {
3836
$this->children = $children;
@@ -46,7 +44,7 @@ public static function of(
4644
array $parameters = [],
4745
string $template = Rule::TEMPLATE_STANDARD,
4846
): self {
49-
return new self($hasPassed, $input, $rule, Id::fromRule($rule), $parameters, $template);
47+
return new self($hasPassed, new Subject($input), $rule, Id::fromRule($rule), $parameters, $template);
5048
}
5149

5250
/** @param array<string, mixed> $parameters */
@@ -74,12 +72,12 @@ public function asAdjacentOf(Result $result, string $prefix): Result
7472
if ($this->allowsAdjacent()) {
7573
return clone ($result, [
7674
'id' => $this->id->withPrefix($prefix),
77-
'adjacent' => $this->withInput($result->input),
75+
'adjacent' => $this->withSubject($result->subject),
7876
]);
7977
}
8078

8179
return clone ($this, [
82-
'input' => $result->input,
80+
'subject' => $result->subject,
8381
'children' => array_map(
8482
static fn(Result $child) => $child->asAdjacentOf($result, $prefix),
8583
$this->children,
@@ -111,18 +109,8 @@ public function withIdFrom(Rule $rule): self
111109

112110
public function withPath(Path $path): self
113111
{
114-
if ($this->path === $path) {
115-
return $this;
116-
}
117-
118-
if ($this->path !== null) {
119-
$this->path->parent = $path;
120-
121-
return $this;
122-
}
123-
124112
return clone($this, [
125-
'path' => $path,
113+
'subject' => $this->subject->withPath($path),
126114
'adjacent' => $this->adjacent?->withPath($path),
127115
'children' => array_map(
128116
static fn(Result $child) => $child->withPath($path),
@@ -133,40 +121,30 @@ public function withPath(Path $path): self
133121

134122
public function withoutName(): self
135123
{
136-
if ($this->name === null) {
137-
return $this;
138-
}
139-
140124
return clone ($this, [
141-
'name' => null,
125+
'subject' => $this->subject->withoutName(),
142126
'adjacent' => $this->adjacent?->withoutName(),
143127
'children' => array_map(
144-
fn(Result $child) => $child->name === $this->name ? $child->withoutName() : $child,
128+
fn(Result $child) => $child->subject->name === $this->subject->name ? $child->withoutName() : $child,
145129
$this->children,
146130
),
147131
]);
148132
}
149133

150134
public function withChildren(Result ...$children): self
151135
{
152-
if ($this->path === null) {
153-
return clone($this, ['children' => $children]);
154-
}
155-
156-
return clone($this, ['children' => array_map(fn(Result $child) => $child->withPath($this->path), $children)]);
136+
return clone($this, [
137+
'children' => array_map(fn(Result $child) => $child->withSubject($this->subject), $children),
138+
]);
157139
}
158140

159141
public function withName(Name $name): self
160142
{
161-
if ($this->path !== null && $this->name?->path !== $this->path) {
162-
$name = $name->withPath($this->path);
163-
}
164-
165143
return clone($this, [
166-
'name' => $this->name ?? $name,
144+
'subject' => $this->subject->withName($name),
167145
'adjacent' => $this->adjacent?->withName($name),
168146
'children' => array_map(
169-
static fn(Result $child) => $child->path === null ? $child->withName($child->name ?? $name) : $child,
147+
static fn(Result $child) => $child->withName($name),
170148
$this->children,
171149
),
172150
]);
@@ -176,7 +154,7 @@ public function withNameFrom(Rule $rule): self
176154
{
177155
if ($rule instanceof Nameable && $rule->getName() !== null) {
178156
return clone($this, [
179-
'name' => $this->name ?? $rule->getName(),
157+
'subject' => $this->subject->withName2($rule->getName()),
180158
'adjacent' => $this->adjacent?->withNameFrom($rule),
181159
'children' => array_map(
182160
static fn(Result $child) => $child->withNameFrom($rule),
@@ -188,16 +166,12 @@ public function withNameFrom(Rule $rule): self
188166
return $this;
189167
}
190168

191-
public function withInput(mixed $input): self
169+
public function withSubject(Subject $subject): self
192170
{
193-
$currentInput = $this->input;
194-
195171
return clone($this, [
196-
'input' => $input,
197-
'children' => array_map(
198-
static fn(Result $child) => $child->input === $currentInput ? $child->withInput($input) : $child,
199-
$this->children,
200-
),
172+
'subject' => $this->subject->withMergeFrom($subject),
173+
'adjacent' => $this->adjacent?->withSubject($subject),
174+
'children' => array_map(static fn(Result $child) => $child->withSubject($subject), $this->children),
201175
]);
202176
}
203177

‎library/ResultQuery.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ public function findById(string $id): self|null
5252

5353
public function findByName(string $name): self|null
5454
{
55-
if ($this->result->name?->value === $name) {
55+
if ($this->result->subject->name?->value === $name) {
5656
return $this;
5757
}
5858

5959
foreach ($this->result->children as $child) {
6060
$resultQuery = clone ($this, ['result' => $child]);
61-
if ($child->name?->value === $name) {
61+
if ($child->subject->name?->value === $name) {
6262
return $resultQuery;
6363
}
6464

@@ -70,15 +70,15 @@ public function findByName(string $name): self|null
7070

7171
public function findByPath(string|int $path): self|null
7272
{
73-
if ($this->result->path?->value === $path) {
73+
if ($this->result->subject->path?->value === $path) {
7474
return $this;
7575
}
7676

7777
$paths = is_string($path) ? explode('.', $path) : [$path];
7878
$currentPath = array_shift($paths);
7979

8080
foreach ($this->result->children as $child) {
81-
if ($child->path?->value !== $currentPath) {
81+
if ($child->subject->path?->value !== $currentPath) {
8282
continue;
8383
}
8484

‎library/Rules/NullOr.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private function enrichResult(Result $result): Result
4242
if ($result->allowsAdjacent()) {
4343
return $result
4444
->withId($result->id->withPrefix('nullOr'))
45-
->withAdjacent(Result::of($result->hasPassed, $result->input, $this));
45+
->withAdjacent(Result::of($result->hasPassed, $result->subject->input, $this));
4646
}
4747

4848
return $result->withChildren(...array_map(fn(Result $child) => $this->enrichResult($child), $result->children));

0 commit comments

Comments
 (0)