mirror of
https://github.com/elyby/accounts.git
synced 2025-05-31 14:11:46 +05:30
Upgrade project to PHP 8.3, add PHPStan, upgrade almost every dependency (#36)
* start updating to PHP 8.3 * taking off! Co-authored-by: ErickSkrauch <erickskrauch@yandex.ru> Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com> * dropped this Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com> * migrate to symfonymailer Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com> * this is so stupid 😭 Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com> * ah, free, at last. Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com> * oh, Gabriel. Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com> * now dawns thy reckoning. Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com> * and thy gore shall GLISTEN before the temples of man. Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com> * creature of steel. Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com> * my gratitude upon thee for my freedom. Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com> * but the crimes thy kind has committed against humanity Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com> * Upgrade PHP-CS-Fixer and do fix the codebase * First review round (maybe I have broken something) * are NOT forgotten. Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com> * Enable parallel PHP-CS-Fixer runner * PHPStan level 1 * PHPStan level 2 * PHPStan level 3 * PHPStan level 4 * PHPStan level 5 * Levels 6 and 7 takes too much effort. Generate a baseline and fix them eventually * Resolve TODO's related to the php-mock * Drastically reduce baseline size with the Rector * More code modernization with help of the Rector * Update GitLab CI --------- Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com> Co-authored-by: ErickSkrauch <erickskrauch@yandex.ru>
This commit is contained in:
Octol1ttle
GitHub
@@ -15,15 +15,15 @@ use yii\validators\Validator;
|
||||
final class EmailValidator extends Validator {
|
||||
|
||||
/**
|
||||
* @var callable(): int the function must return the account id for which the current validation is being performed.
|
||||
* @phpstan-var \Closure(): int the function must return the account id for which the current validation is being performed.
|
||||
* Allows you to skip the email uniqueness check for the current account.
|
||||
*/
|
||||
public $accountCallback;
|
||||
public ?\Closure $accountCallback = null;
|
||||
|
||||
public $skipOnEmpty = false;
|
||||
|
||||
public function validateAttribute($model, $attribute): void {
|
||||
$trim = new validators\FilterValidator(['filter' => [StringHelper::class, 'trim']]);
|
||||
$trim = new validators\FilterValidator(['filter' => StringHelper::trim(...)]);
|
||||
|
||||
$required = new validators\RequiredValidator();
|
||||
$required->message = E::EMAIL_REQUIRED;
|
||||
@@ -40,7 +40,7 @@ final class EmailValidator extends Validator {
|
||||
$additionalEmail = new class extends Validator {
|
||||
protected function validateValue($value): ?array {
|
||||
// Disallow emails starting with slash since Postfix (or someone before?) can't correctly handle it
|
||||
if (str_starts_with($value, '/')) {
|
||||
if (str_starts_with((string)$value, '/')) {
|
||||
return [E::EMAIL_INVALID, []];
|
||||
}
|
||||
|
||||
@@ -57,7 +57,7 @@ final class EmailValidator extends Validator {
|
||||
];
|
||||
|
||||
protected function validateValue($value): ?array {
|
||||
$host = explode('@', $value)[1];
|
||||
$host = explode('@', (string)$value)[1];
|
||||
if (in_array($host, $this->hosts, true)) {
|
||||
return [E::EMAIL_HOST_IS_NOT_ALLOWED, []];
|
||||
}
|
||||
@@ -81,15 +81,15 @@ final class EmailValidator extends Validator {
|
||||
};
|
||||
}
|
||||
|
||||
$this->executeValidation($trim, $model, $attribute) &&
|
||||
$this->executeValidation($required, $model, $attribute) &&
|
||||
$this->executeValidation($length, $model, $attribute) &&
|
||||
$this->executeValidation($email, $model, $attribute) &&
|
||||
$this->executeValidation($additionalEmail, $model, $attribute) &&
|
||||
$this->executeValidation($tempmail, $model, $attribute) &&
|
||||
$this->executeValidation($blacklist, $model, $attribute) &&
|
||||
$this->executeValidation($idnaDomain, $model, $attribute) &&
|
||||
$this->executeValidation($unique, $model, $attribute);
|
||||
$this->executeValidation($trim, $model, $attribute)
|
||||
&& $this->executeValidation($required, $model, $attribute)
|
||||
&& $this->executeValidation($length, $model, $attribute)
|
||||
&& $this->executeValidation($email, $model, $attribute)
|
||||
&& $this->executeValidation($additionalEmail, $model, $attribute)
|
||||
&& $this->executeValidation($tempmail, $model, $attribute)
|
||||
&& $this->executeValidation($blacklist, $model, $attribute)
|
||||
&& $this->executeValidation($idnaDomain, $model, $attribute)
|
||||
&& $this->executeValidation($unique, $model, $attribute);
|
||||
}
|
||||
|
||||
private function executeValidation(Validator $validator, Model $model, string $attribute): bool {
|
||||
|
||||
@@ -27,7 +27,7 @@ class LanguageValidator extends Validator {
|
||||
$primary = Locale::getPrimaryLanguage($value);
|
||||
$region = Locale::getRegion($value);
|
||||
$locales = ResourceBundle::getLocales(''); // http://php.net/manual/ru/resourcebundle.locales.php#115965
|
||||
if (($region !== '' && strtolower($primary) !== strtolower($region)) && !in_array($value, $locales)) {
|
||||
if (($region !== '' && strtolower((string)$primary) !== strtolower((string)$region)) && !in_array($value, $locales)) {
|
||||
return [$this->message, []];
|
||||
}
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ use yii\validators\Validator;
|
||||
|
||||
class MinecraftServerAddressValidator extends Validator {
|
||||
|
||||
protected function validateValue($value) {
|
||||
protected function validateValue($value): ?array {
|
||||
// we will add minecraft protocol to help parse_url understand all another parts
|
||||
$urlParts = parse_url('minecraft://' . $value);
|
||||
$cnt = count($urlParts);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<?php
|
||||
namespace common\validators;
|
||||
|
||||
use Closure;
|
||||
use common\helpers\Error as E;
|
||||
use common\helpers\StringHelper;
|
||||
use common\models\Account;
|
||||
@@ -12,15 +13,15 @@ use yii\validators\Validator;
|
||||
class UsernameValidator extends Validator {
|
||||
|
||||
/**
|
||||
* @var \Closure the function must return the account id for which the current validation is being performed.
|
||||
* @phpstan-var \Closure(): int the function must return the account id for which the current validation is being performed.
|
||||
* Allows you to skip the username check for the current account.
|
||||
*/
|
||||
public $accountCallback;
|
||||
public ?Closure $accountCallback = null;
|
||||
|
||||
public $skipOnEmpty = false;
|
||||
|
||||
public function validateAttribute($model, $attribute) {
|
||||
$filter = new validators\FilterValidator(['filter' => [StringHelper::class, 'trim']]);
|
||||
public function validateAttribute($model, $attribute): ?array {
|
||||
$filter = new validators\FilterValidator(['filter' => StringHelper::trim(...)]);
|
||||
|
||||
$required = new validators\RequiredValidator();
|
||||
$required->message = E::USERNAME_REQUIRED;
|
||||
@@ -39,16 +40,18 @@ class UsernameValidator extends Validator {
|
||||
$unique->targetClass = Account::class;
|
||||
$unique->targetAttribute = 'username';
|
||||
if ($this->accountCallback !== null) {
|
||||
$unique->filter = function(QueryInterface $query) {
|
||||
$unique->filter = function(QueryInterface $query): void {
|
||||
$query->andWhere(['NOT', ['id' => ($this->accountCallback)()]]);
|
||||
};
|
||||
}
|
||||
|
||||
$this->executeValidation($filter, $model, $attribute) &&
|
||||
$this->executeValidation($required, $model, $attribute) &&
|
||||
$this->executeValidation($length, $model, $attribute) &&
|
||||
$this->executeValidation($pattern, $model, $attribute) &&
|
||||
$this->executeValidation($unique, $model, $attribute);
|
||||
$this->executeValidation($filter, $model, $attribute)
|
||||
&& $this->executeValidation($required, $model, $attribute)
|
||||
&& $this->executeValidation($length, $model, $attribute)
|
||||
&& $this->executeValidation($pattern, $model, $attribute)
|
||||
&& $this->executeValidation($unique, $model, $attribute);
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
protected function executeValidation(Validator $validator, Model $model, string $attribute) {
|
||||
|
||||
Reference in New Issue
Block a user