diff --git a/src/Application/Actions/User/Ajax/ChangePasswordSubmitAction.php b/src/Application/Actions/User/Ajax/ChangePasswordSubmitAction.php index 13a21bfe..be9a23aa 100644 --- a/src/Application/Actions/User/Ajax/ChangePasswordSubmitAction.php +++ b/src/Application/Actions/User/Ajax/ChangePasswordSubmitAction.php @@ -48,9 +48,9 @@ public function __construct( * @param Response $response * @param array $args * - * @return Response * @throws \JsonException * + * @return Response */ public function __invoke(ServerRequest $request, Response $response, array $args): Response { diff --git a/src/Domain/Validation/Validator.php b/src/Domain/Validation/Validator.php index d8d737cd..8d1f42a4 100644 --- a/src/Domain/Validation/Validator.php +++ b/src/Domain/Validation/Validator.php @@ -141,6 +141,7 @@ public function validateEmail( * @param \DateTimeImmutable|string|null $birthdate * @param ValidationResult $validationResult * @param bool $required + * @param string $format */ public function validateBirthdate( \DateTimeImmutable|string|null $birthdate, @@ -155,7 +156,7 @@ public function validateBirthdate( // If birthdate is string, create DateTimeImmutable object for validation $birthdateObj = DateTimeImmutable::createFromFormat($format, $birthdate); // Allow default format Y-m-d as well (client creation via API submit) - if (false === $birthdateObj || array_sum($birthdateObj->getLastErrors())){ + if (false === $birthdateObj || array_sum($birthdateObj->getLastErrors())) { // Try with default format and original value $birthdateObj = DateTimeImmutable::createFromFormat('Y-m-d', $birthdate); } @@ -165,6 +166,7 @@ public function validateBirthdate( // Birthdate is not null, not a string with valid date and also not an instance of the custom // DateTimeImmutable format (from the data object) it means that its invalid $validationResult->setError('birthdate', __('Invalid value dd.mm.YYYY')); + return; }