mirror of
https://github.com/Respect/Validation.git
synced 2026-03-15 23:05:45 +01:00
This commit resolves an issue where validation messages would overwrite each other when multiple validators failed on the same path or key (e.g., within an `Each` or `Key` validator). Changes to `NestedArrayFormatter`: - Implemented a merge strategy: Key collisions now result in a list of messages instead of the last message winning. - Improved handling of mixed key types: When both numeric and string keys are present (common in composite validators), numeric keys are now replaced by the validator's ID (e.g., `arrayType`, `equals`) to provide meaningful, distinct keys. - Preserved list behavior: Purely numeric key sets are treated as lists, maintaining their sequence without re-keying logic. - Refactored the class to use smaller, single-purpose methods and `array_reduce` for clarity. Tests: - Updated feature tests (`EachTest`, `AttributesTest`, etc.) to expect the full set of validation errors. - Enhanced `NestedArrayFormatterTest` with scenarios for key collisions, mixed keys, and ID substitution.
141 lines
5.6 KiB
PHP
141 lines
5.6 KiB
PHP
<?php
|
|
|
|
/*
|
|
* Copyright (c) Alexandre Gomes Gaigalas <alganet@gmail.com>
|
|
* SPDX-License-Identifier: MIT
|
|
*/
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace Respect\Validation\Message\Formatter;
|
|
|
|
use PHPUnit\Framework\Attributes\CoversClass;
|
|
use PHPUnit\Framework\Attributes\DataProvider;
|
|
use PHPUnit\Framework\Attributes\Test;
|
|
use Respect\Validation\Message\StandardFormatter\ResultCreator;
|
|
use Respect\Validation\Path;
|
|
use Respect\Validation\Result;
|
|
use Respect\Validation\Test\Builders\ResultBuilder;
|
|
use Respect\Validation\Test\Message\TestingMessageRenderer;
|
|
use Respect\Validation\Test\TestCase;
|
|
|
|
#[CoversClass(NestedArrayFormatter::class)]
|
|
final class NestedArrayFormatterTest extends TestCase
|
|
{
|
|
use ResultCreator;
|
|
|
|
/**
|
|
* @param array<string, mixed> $expected
|
|
* @param array<string, mixed> $templates
|
|
*/
|
|
#[Test]
|
|
#[DataProvider('provideForArray')]
|
|
public function itShouldFormatArrayMessage(Result $result, array $expected, array $templates = []): void
|
|
{
|
|
$renderer = new TestingMessageRenderer();
|
|
$formatter = new NestedArrayFormatter();
|
|
|
|
self::assertSame($expected, $formatter->format($result, $renderer, $templates));
|
|
}
|
|
|
|
/** @return array<string, array{0: Result, 1: array<int|string, mixed>, 2?: array<int|string, mixed>}> */
|
|
public static function provideForArray(): array
|
|
{
|
|
return [
|
|
'without children' => [
|
|
(new ResultBuilder())->id('only')->template('__parent_original__')->build(),
|
|
['only' => '__parent_original__'],
|
|
],
|
|
'with single-level children' => [
|
|
self::singleLevelChildrenMessage(),
|
|
[
|
|
'__root__' => '__parent_original__',
|
|
'1st' => '__1st_original__',
|
|
'2nd' => '__2nd_original__',
|
|
'3rd' => '__3rd_original__',
|
|
],
|
|
],
|
|
'with single-nested child' => [
|
|
self::multiLevelChildrenWithSingleNestedChildMessage(),
|
|
[
|
|
'__root__' => '__parent_original__',
|
|
'1st' => '__1st_original__',
|
|
'2nd' => '__2nd_1st_original__',
|
|
'3rd' => '__3rd_original__',
|
|
],
|
|
],
|
|
'with multi-nested children' => [
|
|
self::multiLevelChildrenWithMultiNestedChildrenMessage(),
|
|
[
|
|
'__root__' => '__parent_original__',
|
|
'1st' => '__1st_original__',
|
|
'2nd' => [
|
|
'__root__' => '__2nd_original__',
|
|
'2nd_1st' => '__2nd_1st_original__',
|
|
'2nd_2nd' => '__2nd_2nd_original__',
|
|
],
|
|
'3rd' => '__3rd_original__',
|
|
],
|
|
],
|
|
'with string key collision' => [
|
|
(new ResultBuilder())->id('root')->template('root_msg')
|
|
->children(
|
|
(new ResultBuilder())->id('c1')->template('msg1')->withPath(new Path('foo'))->build(),
|
|
(new ResultBuilder())->id('c2')->template('msg2')->withPath(new Path('foo'))->build(),
|
|
)->build(),
|
|
[
|
|
'foo' => ['msg1', 'msg2'],
|
|
],
|
|
],
|
|
'with numeric key collision (list)' => [
|
|
(new ResultBuilder())->id('root')->template('root_msg')
|
|
->children(
|
|
(new ResultBuilder())->id('c1')->template('msg1')->withPath(new Path(0))->build(),
|
|
(new ResultBuilder())->id('c2')->template('msg2')->withPath(new Path(0))->build(),
|
|
)->build(),
|
|
[
|
|
'__root__' => 'root_msg',
|
|
0 => 'msg1',
|
|
1 => 'msg2',
|
|
],
|
|
],
|
|
'with mixed keys replacement' => [
|
|
(new ResultBuilder())->id('root')->template('root_msg')
|
|
->children(
|
|
(new ResultBuilder())->id('c1')->template('msg1')->withPath(new Path('foo'))->build(),
|
|
(new ResultBuilder())->id('c2')->template('msg2')->withPath(new Path(0))->build(),
|
|
)->build(),
|
|
[
|
|
'__root__' => 'root_msg',
|
|
'foo' => 'msg1',
|
|
'c2' => 'msg2',
|
|
],
|
|
],
|
|
'with mixed keys and ID collision' => [
|
|
(new ResultBuilder())->id('root')->template('root_msg')
|
|
->children(
|
|
(new ResultBuilder())->id('c1')->template('msg1')->withPath(new Path('foo'))->build(),
|
|
(new ResultBuilder())->id('sameId')->template('msg2')->withPath(new Path(0))->build(),
|
|
(new ResultBuilder())->id('sameId')->template('msg3')->withPath(new Path(1))->build(),
|
|
)->build(),
|
|
[
|
|
'__root__' => 'root_msg',
|
|
'foo' => 'msg1',
|
|
'sameId' => ['msg2', 'msg3'],
|
|
],
|
|
],
|
|
'with pure numeric keys' => [
|
|
(new ResultBuilder())->id('root')->template('root_msg')
|
|
->children(
|
|
(new ResultBuilder())->id('c1')->template('msg1')->withPath(new Path(10))->build(),
|
|
(new ResultBuilder())->id('c2')->template('msg2')->withPath(new Path(20))->build(),
|
|
)->build(),
|
|
[
|
|
'__root__' => 'root_msg',
|
|
0 => 'msg1',
|
|
1 => 'msg2',
|
|
],
|
|
],
|
|
];
|
|
}
|
|
}
|