Fixed adult rule

This commit is contained in:
Jérémy Munsch 2023-02-20 17:49:15 +01:00
parent c8bd8e2dd6
commit c1d542cd38
No known key found for this signature in database
GPG key ID: 18361AF3BFEC0FEC
3 changed files with 54 additions and 23 deletions

View file

@ -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 ?

View file

@ -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)
);

View file

@ -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;
}
}