Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Validation Failure Collection Factory dependency from Validator #26

Merged
merged 2 commits into from
Apr 1, 2023
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Assertion/Asserter.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ public function assert(mixed $subject, ValidationInterface $validation, array $m
try {
$validation->getRules()->assert($subject);
} catch (NestedValidationException $exception) {
if ($message = $validation->getMessage()) {
$message = $validation->getMessage();
if (null !== $message) {
$failures->add(
$this->validationFailureFactory->create($message, $subject, $validation->getProperty())
);
Expand Down
19 changes: 11 additions & 8 deletions src/Validator.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
use Awurth\Validator\Assertion\AsserterInterface;
use Awurth\Validator\Exception\InvalidPropertyOptionsException;
use Awurth\Validator\Failure\ValidationFailureCollectionFactory;
use Awurth\Validator\Failure\ValidationFailureCollectionFactoryInterface;
use Awurth\Validator\Failure\ValidationFailureCollectionInterface;
use Awurth\Validator\Failure\ValidationFailureFactory;
use Psr\Http\Message\ServerRequestInterface as Request;
Expand All @@ -32,7 +31,6 @@ final class Validator implements ValidatorInterface
{
public function __construct(
private readonly ValidationFactoryInterface $validationFactory,
private readonly ValidationFailureCollectionFactoryInterface $validationFailureCollectionFactory,
private readonly AsserterInterface $asserter,
) {
}
Expand All @@ -44,12 +42,9 @@ public static function create(
?AsserterInterface $asserter = null,
array $messages = [],
): self {
$validationFailureCollectionFactory = new ValidationFailureCollectionFactory();

return new self(
new ValidationFactory(),
$validationFailureCollectionFactory,
$asserter ?? new Asserter($validationFailureCollectionFactory, new ValidationFailureFactory(), $messages),
$asserter ?? new Asserter(new ValidationFailureCollectionFactory(), new ValidationFailureFactory(), $messages),
);
}

Expand All @@ -63,7 +58,11 @@ public function validate(mixed $subject, Validatable|array $rules, array $messag
return $this->asserter->assert($subject, $this->validationFactory->create($rules), $messages);
}

$failures = $this->validationFailureCollectionFactory->create();
if ([] === $rules) {
throw new \InvalidArgumentException('Rules cannot be empty');
}

$failures = null;
foreach ($rules as $property => $options) {
if ($options instanceof Validatable) {
$options = ['rules' => $options];
Expand All @@ -74,7 +73,11 @@ public function validate(mixed $subject, Validatable|array $rules, array $messag
$validation = $this->validationFactory->create($options, $property);
$value = $this->getValue($subject, $property, $validation->getDefault());

$failures->addAll($this->asserter->assert($value, $validation, $messages));
if (null === $failures) {
$failures = $this->asserter->assert($value, $validation, $messages);
} else {
$failures->addAll($this->asserter->assert($value, $validation, $messages));
}
}

return $failures;
Expand Down
7 changes: 7 additions & 0 deletions tests/ValidatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@ public function testValidateWithRulesWrongType(): void
]);
}

public function testValidateWithRulesEmptyArray(): void
{
$this->expectException(\InvalidArgumentException::class);

$this->validator->validate($this->request, []);
}

public function testRequest(): void
{
$errors = $this->validator->validate($this->request, ['username' => V::length(6)]);
Expand Down