mirror of
https://github.com/Respect/Validation.git
synced 2026-03-16 15:25:45 +01:00
cd96d01364
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.
93 lines
4.9 KiB
PHP
93 lines
4.9 KiB
PHP
<?php
|
|
|
|
/*
|
|
* Copyright (c) Alexandre Gomes Gaigalas <alganet@gmail.com>
|
|
* SPDX-License-Identifier: MIT
|
|
*/
|
|
|
|
declare(strict_types=1);
|
|
|
|
use Respect\Validation\Test\Stubs\WithAttributes;
|
|
|
|
test('Default', catchAll(
|
|
fn() => v::attributes()->assert(new WithAttributes('', '2024-06-23', 'john.doe@gmail.com')),
|
|
fn(string $message, string $fullMessage, array $messages) => expect()
|
|
->and($message)->toBe('`.name` must be defined')
|
|
->and($fullMessage)->toBe('- `.name` must be defined')
|
|
->and($messages)->toBe(['name' => '`.name` must be defined']),
|
|
));
|
|
|
|
test('Inverted', catchAll(
|
|
fn() => v::attributes()->assert(new WithAttributes('John Doe', '2024-06-23', 'john.doe@gmail.com', '+1234567890')),
|
|
fn(string $message, string $fullMessage, array $messages) => expect()
|
|
->and($message)->toBe('`.phone` must be a valid telephone number or must be null')
|
|
->and($fullMessage)->toBe('- `.phone` must be a valid telephone number or must be null')
|
|
->and($messages)->toBe(['phone' => '`.phone` must be a valid telephone number or must be null']),
|
|
));
|
|
|
|
test('Not an object', catchAll(
|
|
fn() => v::attributes()->assert([]),
|
|
fn(string $message, string $fullMessage, array $messages) => expect()
|
|
->and($message)->toBe('`[]` must be an object')
|
|
->and($fullMessage)->toBe('- `[]` must be an object')
|
|
->and($messages)->toBe(['attributes' => '`[]` must be an object']),
|
|
));
|
|
|
|
test('Nullable', catchAll(
|
|
fn() => v::attributes()->assert(new WithAttributes('John Doe', '2024-06-23', 'john.doe@gmail.com', 'not a phone number')),
|
|
fn(string $message, string $fullMessage, array $messages) => expect()
|
|
->and($message)->toBe('`.phone` must be a valid telephone number or must be null')
|
|
->and($fullMessage)->toBe('- `.phone` must be a valid telephone number or must be null')
|
|
->and($messages)->toBe(['phone' => '`.phone` must be a valid telephone number or must be null']),
|
|
));
|
|
|
|
test('Multiple attributes, all failed', catchAll(
|
|
fn() => v::attributes()->assert(new WithAttributes('', 'not a date', 'not an email', 'not a phone number')),
|
|
fn(string $message, string $fullMessage, array $messages) => expect()
|
|
->and($message)->toBe('`.name` must be defined')
|
|
->and($fullMessage)->toBe(<<<'FULL_MESSAGE'
|
|
- `Respect\Validation\Test\Stubs\WithAttributes { +$name="" +$birthdate="not a date" #$phone="not a phone number" + ... }` must pass the rules
|
|
- `.name` must be defined
|
|
- `.birthdate` must pass all the rules
|
|
- `.birthdate` must be a valid date in the format "2005-12-30"
|
|
- For comparison with now, `.birthdate` must be a valid datetime
|
|
- `.phone` must be a valid telephone number or must be null
|
|
- `.email` must be a valid email address or must be null
|
|
FULL_MESSAGE)
|
|
->and($messages)->toBe([
|
|
'__root__' => '`Respect\Validation\Test\Stubs\WithAttributes { +$name="" +$birthdate="not a date" #$phone="not a phone number" + ... }` must pass the rules',
|
|
'name' => '`.name` must be defined',
|
|
'birthdate' => [
|
|
'`.birthdate` must be a valid date in the format "2005-12-30"',
|
|
'For comparison with now, `.birthdate` must be a valid datetime',
|
|
],
|
|
'phone' => '`.phone` must be a valid telephone number or must be null',
|
|
'email' => '`.email` must be a valid email address or must be null',
|
|
]),
|
|
));
|
|
|
|
test('Failed attributes on the class', catchAll(
|
|
fn() => v::attributes()->assert(new WithAttributes('John Doe', '2024-06-23')),
|
|
fn(string $message, string $fullMessage, array $messages) => expect()
|
|
->and($message)->toBe('`.email` must be defined')
|
|
->and($fullMessage)->toBe(<<<'FULL_MESSAGE'
|
|
- `Respect\Validation\Test\Stubs\WithAttributes { +$name="John Doe" +$birthdate="2024-06-23" #$phone=null +$address ... }` must pass at least one of the rules
|
|
- `.email` must be defined
|
|
- `.phone` must be defined
|
|
FULL_MESSAGE)
|
|
->and($messages)->toBe([
|
|
'anyOf' => [
|
|
'__root__' => '`Respect\Validation\Test\Stubs\WithAttributes { +$name="John Doe" +$birthdate="2024-06-23" #$phone=null +$address ... }` must pass at least one of the rules',
|
|
'email' => '`.email` must be defined',
|
|
'phone' => '`.phone` must be defined',
|
|
],
|
|
]),
|
|
));
|
|
|
|
test('Multiple attributes, one failed', catchAll(
|
|
fn() => v::attributes()->assert(new WithAttributes('John Doe', '22 years ago', 'john.doe@gmail.com')),
|
|
fn(string $message, string $fullMessage, array $messages) => expect()
|
|
->and($message)->toBe('`.birthdate` must be a valid date in the format "2005-12-30"')
|
|
->and($fullMessage)->toBe('- `.birthdate` must be a valid date in the format "2005-12-30"')
|
|
->and($messages)->toBe(['birthdate' => '`.birthdate` must be a valid date in the format "2005-12-30"']),
|
|
));
|