Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-09-29 01:55:01 +00:00
Code Issues Actions Projects Releases Wiki Activity

DX: apply rector rules up to php8.0

Browse Source
This commit is contained in:
Julien Fastré
2023-04-15 01:05:37 +02:00
parent d8870e906f
commit dde3002100
714 changed files with 2348 additions and 9263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
View File

@@ -22,21 +22,11 @@ class PasswordRecoverEvent extends Event
public const INVALID_TOKEN = 'chill_main.password_recover_invalid_token';
/**
* @var string
*/
protected $ip;
/**
* @var bool
*/
protected $safelyGenerated;
/**
* @var string
*/
protected $token;
/**
* @var User
*/
@@ -48,11 +38,9 @@ class PasswordRecoverEvent extends Event
* @param type $ip
* @param bool $safelyGenerated true if generated safely (from console command, etc.)
*/
public function __construct($token = null, ?User $user = null, $ip = null, bool $safelyGenerated = false)
public function __construct(protected $token = null, ?User $user = null, protected $ip = null, bool $safelyGenerated = false)
{
$this->user = $user;
$this->token = $token;
$this->ip = $ip;
$this->safelyGenerated = $safelyGenerated;
}
@@ -69,10 +57,7 @@ class PasswordRecoverEvent extends Event
return $this->token;
}
/**
* @return User|null
*/
public function getUser()
public function getUser(): ?\Chill\MainBundle\Entity\User
{
return $this->user;
}

75
src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverLocker.php
View File

@@ -80,67 +80,36 @@ class PasswordRecoverLocker
*/
public static function generateLockKey($usage, int $number, $discriminator = null)
{
switch ($usage) {
case 'invalid_token_global':
return sprintf('invalid_token_global_%d', $number);
case 'invalid_token_by_ip':
return sprintf('invalid_token_ip_%s_%d', $discriminator, $number);
case 'ask_token_invalid_form_global':
return sprintf('ask_token_invalid_form_global_%d', $number);
case 'ask_token_invalid_form_by_ip':
return sprintf('ask_token_invalid_form_by_ip_%s_%d', $discriminator, $number);
case 'ask_token_success_by_user':
return sprintf('ask_token_success_by_user_%s_%d', $discriminator->getId(), $number);
default:
throw new LogicException('this usage is not implemented');
}
return match ($usage) {
'invalid_token_global' => sprintf('invalid_token_global_%d', $number),
'invalid_token_by_ip' => sprintf('invalid_token_ip_%s_%d', $discriminator, $number),
'ask_token_invalid_form_global' => sprintf('ask_token_invalid_form_global_%d', $number),
'ask_token_invalid_form_by_ip' => sprintf('ask_token_invalid_form_by_ip_%s_%d', $discriminator, $number),
'ask_token_success_by_user' => sprintf('ask_token_success_by_user_%s_%d', $discriminator->getId(), $number),
default => throw new LogicException('this usage is not implemented'),
};
}
public function getMax($usage)
{
switch ($usage) {
case 'invalid_token_global':
return self::MAX_INVALID_TOKEN_GLOBAL;
case 'invalid_token_by_ip':
return self::MAX_INVALID_TOKEN_BY_IP;
case 'ask_token_invalid_form_global':
return self::MAX_ASK_TOKEN_INVALID_FORM_GLOBAL;
case 'ask_token_invalid_form_by_ip':
return self::MAX_ASK_TOKEN_INVALID_FORM_BY_IP;
case 'ask_token_success_by_user':
return self::MAX_ASK_TOKEN_BY_USER;
default:
throw new UnexpectedValueException("this usage '{$usage}' is not yet implemented");
}
return match ($usage) {
'invalid_token_global' => self::MAX_INVALID_TOKEN_GLOBAL,
'invalid_token_by_ip' => self::MAX_INVALID_TOKEN_BY_IP,
'ask_token_invalid_form_global' => self::MAX_ASK_TOKEN_INVALID_FORM_GLOBAL,
'ask_token_invalid_form_by_ip' => self::MAX_ASK_TOKEN_INVALID_FORM_BY_IP,
'ask_token_success_by_user' => self::MAX_ASK_TOKEN_BY_USER,
default => throw new UnexpectedValueException("this usage '{$usage}' is not yet implemented"),
};
}
public function getTtl($usage)
{
switch ($usage) {
case 'invalid_token_global':
case 'invalid_token_by_ip':
return self::INVALID_TOKEN_TTL;
case 'ask_token_invalid_form_global':
case 'ask_token_invalid_form_by_ip':
return self::ASK_TOKEN_INVALID_FORM_TTL;
case 'ask_token_success_by_user':
return self::ASK_TOKEN_INVALID_FORM_TTL * 24;
default:
throw new UnexpectedValueException("this usage '{$usage}' is not yet implemented");
}
return match ($usage) {
'invalid_token_global', 'invalid_token_by_ip' => self::INVALID_TOKEN_TTL,
'ask_token_invalid_form_global', 'ask_token_invalid_form_by_ip' => self::ASK_TOKEN_INVALID_FORM_TTL,
'ask_token_success_by_user' => self::ASK_TOKEN_INVALID_FORM_TTL * 24,
default => throw new UnexpectedValueException("this usage '{$usage}' is not yet implemented"),
};
}
public function isLocked($usage, $discriminator = null)

7
src/Bundle/ChillMainBundle/Security/PasswordRecover/TokenManager.php
View File

@@ -43,13 +43,10 @@ class TokenManager
protected $logger;
/**
* @var string
* @param string $secret
*/
protected $secret;
public function __construct($secret, LoggerInterface $logger)
public function __construct(protected $secret, LoggerInterface $logger)
{
$this->secret = $secret;
$this->logger = $logger;
}