From c1d542cd38f4ac40feb60ca507775b8139dfd331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Mon, 20 Feb 2023 17:49:15 +0100 Subject: [PATCH] Fixed adult rule --- .../Fo/Customers/CreateAccountRequest.php | 2 +- .../Fo/Customers/UpdateInfosRequest.php | 8 +++ app/Rules/Adult.php | 67 +++++++++++++------ 3 files changed, 54 insertions(+), 23 deletions(-) diff --git a/app/Http/Requests/Fo/Customers/CreateAccountRequest.php b/app/Http/Requests/Fo/Customers/CreateAccountRequest.php index 7725607..6d66eb6 100644 --- a/app/Http/Requests/Fo/Customers/CreateAccountRequest.php +++ b/app/Http/Requests/Fo/Customers/CreateAccountRequest.php @@ -47,7 +47,7 @@ class CreateAccountRequest extends FormRequest 'address' => 'required|string|min:1|max:255', 'postcode' => 'required|string|min:1|postal_code:FR', 'city' => 'required|string|min:1|max:255', - 'birth_date' => ['required', new Adult()], + 'birth_date' => ['required', new Adult(trans('Vous devez être majeur pour vous inscrire.'))], 'email' => [ 'required', 'email:rfc,dns,spoof', 'max:255', // * Does email already exists in CRM ? diff --git a/app/Http/Requests/Fo/Customers/UpdateInfosRequest.php b/app/Http/Requests/Fo/Customers/UpdateInfosRequest.php index cbdad12..4770dac 100644 --- a/app/Http/Requests/Fo/Customers/UpdateInfosRequest.php +++ b/app/Http/Requests/Fo/Customers/UpdateInfosRequest.php @@ -2,6 +2,8 @@ namespace App\Http\Requests\Fo\Customers; +use App\Rules\Adult; + class UpdateInfosRequest extends CreateAccountRequest { /** @var array */ @@ -24,6 +26,12 @@ class UpdateInfosRequest extends CreateAccountRequest public function rules() { return \array_intersect_key( + [ + 'birth_date' => [ + 'required', + new Adult(trans('Vous devez être majeur pour utiliser le site.')) + ], + ], parent::rules(), \array_flip(self::$skeleton) ); diff --git a/app/Rules/Adult.php b/app/Rules/Adult.php index 84a40a1..aac044b 100644 --- a/app/Rules/Adult.php +++ b/app/Rules/Adult.php @@ -10,17 +10,19 @@ class Adult implements Rule /** * Error message * - * @var string + * @var string|null */ - private $error_messages = "la date de naissance est incorrecte"; + private $error_message; /** * Create a new rule instance. * + * @param null|string $message * @return void */ - public function __construct() + public function __construct(?string $message = null) { + $this->error_message = $message ?? trans('Vous devez être majeur.'); } /** @@ -29,32 +31,36 @@ class Adult implements Rule * @param mixed $attribute * @param mixed $value * @return boolean - * - * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInImplementedInterfaceBeforeLastUsed + * @throws \Exception If the attribute cannot be parsed. + * @throws \RuntimeException Is already catched. */ public function passes($attribute, $value) { - //@phpcs:enable - $MJ = Carbon::now()->subYears(18); + try { + //@phpcs:enable + $MJ = Carbon::now()->subYears(18); - if ($this->isSqlDate($value)) { - $d = Carbon::createFromFormat('Y-m-d', $value); - if (!$d->lessThanOrEqualTo($MJ)) { - $this->error_messages = __("Vous devez être majeur pour vous inscrire."); - return false; + if ($this->isIsoFormat($value)) { + $d = Carbon::parse($value); } - } elseif ($this->isFormDate($value)) { - $d = Carbon::createFromFormat('d/m/Y', $value); - if (!$d->lessThanOrEqualTo($MJ)) { - $this->error_messages = __("Vous devez être majeur pour vous inscrire."); - return false; + if ($this->isSqlDate($value)) { + $d = Carbon::createFromFormat('Y-m-d', $value); } - } else { - $this->error_messages = __("Erreur sur le champs : date de naissance."); + if ($this->isFormDate($value)) { + $d = Carbon::createFromFormat('d/m/Y', $value); + } + // * Could not parse date. + if (!$d) { + throw new \Exception("Could not parse date {$value} for attribute '{$attribute}'."); + } + if (!$d->lessThanOrEqualTo($MJ)) { + throw new \RuntimeException('Users birthdate does not indicate he is an adult'); + } + } catch (\RuntimeException $e) { + $this->error_message = $this->error_message; return false; - } + }//end try - // Pass. return true; } @@ -65,7 +71,7 @@ class Adult implements Rule */ public function message() { - return $this->error_messages; + return $this->error_message; } /** @@ -95,4 +101,21 @@ class Adult implements Rule } return false; } + + /** + * Check if provided string is iso format + * + * * https://www.w3.org/TR/NOTE-datetime + * + * @param string $date + * @return boolean + */ + private function isIsoFormat(string $date) + { + // phpcs:ignore Generic.Files.LineLength.TooLong + if (preg_match("/^(\d{4})(?:-?W(\d+)(?:-?(\d+)D?)?|(?:-(\d+))?-(\d+))(?:[T ](\d+):(\d+)(?::(\d+)(?:\.(\d+))?)?)?(?:Z(-?\d*))?$/", $date)) { + return true; + } + return false; + } }