Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Validator.php
Original file line number Diff line number Diff line change
Expand Up @@ -245,11 +245,12 @@ protected function getAliasName(ReflectionProperty|ReflectionParameter $reflecti
*/
protected function isToValidate(ReflectionProperty|ReflectionParameter $reflection): bool
{
$useSerialization = $this->context->getOptional('internal.options.ignore.useSerialization', false);
$allAttributes = $reflection->getAttributes(Options\Ignore::class);
foreach ($allAttributes as $attribute) {
$instance = $attribute->newInstance();

return ! $instance->ignoreValidation();
return $useSerialization ? ! $instance->ignoreSerialization() : ! $instance->ignoreValidation();
}

return true;
Expand Down
44 changes: 41 additions & 3 deletions tests/Integration/OptionsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use Attributes\Options as Options;
use Attributes\Options\Exceptions\InvalidOptionException;
use Attributes\Options\Ignore;
use Attributes\Validation\Context;
use Attributes\Validation\Tests\Models as Models;
use Attributes\Validation\Validator;

Expand Down Expand Up @@ -130,8 +131,9 @@
$validator = new Validator(strict: $isStrict);
$rawData = [
'value' => 'my value',
'ignore' => 'ignored',
'ignoreValidation' => 'ignored',
'ignore' => 'both',
'ignoreValidation' => 'validation',
'ignoreSerialization' => 'serialization',
];
$model = $validator->validate($rawData, new class
{
Expand All @@ -142,11 +144,47 @@

#[Ignore(serialization: false)]
public string $ignoreValidation = 'original';

#[Ignore(validation: false)]
public string $ignoreSerialization = 'original';
});
expect($model)
->toHaveProperty('value', 'my value')
->toHaveProperty('ignore', 'original')
->toHaveProperty('ignoreValidation', 'original')
->toHaveProperty('ignoreSerialization', 'serialization');
})
->with([true, false])
->group('validator', 'options', 'ignore');

test('Ignore as a serializer', function (bool $isStrict) {
$context = new Context;
$context->set('internal.options.ignore.useSerialization', true);
$validator = new Validator(strict: $isStrict, context: $context);
$rawData = [
'value' => 'my value',
'ignore' => 'both',
'ignoreValidation' => 'validation',
'ignoreSerialization' => 'serialization',
];
$model = $validator->validate($rawData, new class
{
public string $value;

#[Ignore]
public string $ignore = 'original';

#[Ignore(serialization: false)]
public string $ignoreValidation = 'original';

#[Ignore(validation: false)]
public string $ignoreSerialization = 'original';
});
expect($model)
->toHaveProperty('value', 'my value')
->toHaveProperty('ignore', 'original')
->toHaveProperty('ignoreValidation', 'original');
->toHaveProperty('ignoreValidation', 'validation')
->toHaveProperty('ignoreSerialization', 'original');
})
->with([true, false])
->group('validator', 'options', 'ignore');