ElyBy-Mirror/accounts
1
0
Fork 0
mirror of https://github.com/elyby/accounts.git synced 2025-05-31 14:11:46 +05:30
Code Issues Packages Projects Releases Wiki Activity

Upgrade project to PHP 8.3, add PHPStan, upgrade almost every dependency (#36)

Browse Source 
* 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
2024-12-02 15:10:55 +05:00
committed by GitHub
parent 625250b367
commit 57d492da8a
356 changed files with 10531 additions and 4761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
common/tests/unit/validators/EmailValidatorTest.php
View File

@@ -3,9 +3,11 @@ declare(strict_types=1);
namespace common\tests\unit\validators;
use common\models\Account;
use common\tests\fixtures\AccountFixture;
use common\tests\unit\TestCase;
use common\validators\EmailValidator;
use Generator;
use yii\base\Model;
use yii\validators\EmailValidator as YiiEmailValidator;
@@ -16,7 +18,7 @@ final class EmailValidatorTest extends TestCase {
private EmailValidator $validator;
public function _before() {
public function _before(): void {
parent::_before();
self::defineFunctionMock(YiiEmailValidator::class, 'checkdnsrr');
@@ -25,7 +27,7 @@ final class EmailValidatorTest extends TestCase {
$this->validator = new EmailValidator();
}
public function testValidateTrimming() {
public function testValidateTrimming(): void {
// Prevent it to access to db
$this->getFunctionMock(YiiEmailValidator::class, 'checkdnsrr')->expects($this->any())->willReturn(false);
@@ -35,7 +37,7 @@ final class EmailValidatorTest extends TestCase {
$this->assertSame('testemail@ely.by', $model->field);
}
public function testValidateAttributeRequired() {
public function testValidateAttributeRequired(): void {
$model = $this->createModel('');
$this->validator->validateAttribute($model, 'field');
$this->assertSame(['error.email_required'], $model->getErrors('field'));
@@ -45,14 +47,14 @@ final class EmailValidatorTest extends TestCase {
$this->assertNotSame(['error.email_required'], $model->getErrors('field'));
}
public function testValidateAttributeLength() {
public function testValidateAttributeLength(): void {
$this->getFunctionMock(YiiEmailValidator::class, 'checkdnsrr')->expects($this->any())->willReturn(false);
$model = $this->createModel(
'emailemailemailemailemailemailemailemailemailemailemailemailemailemailemailemailemail' .
'emailemailemailemailemailemailemailemailemailemailemailemailemailemailemailemailemail' .
'emailemailemailemailemailemailemailemailemailemailemailemailemailemailemailemailemail' .
'@gmail.com' // = 256 symbols
'emailemailemailemailemailemailemailemailemailemailemailemailemailemailemailemailemail'
. 'emailemailemailemailemailemailemailemailemailemailemailemailemailemailemailemailemail'
. 'emailemailemailemailemailemailemailemailemailemailemailemailemailemailemailemailemail'
. '@gmail.com', // = 256 symbols
);
$this->validator->validateAttribute($model, 'field');
$this->assertSame(['error.email_too_long'], $model->getErrors('field'));
@@ -62,7 +64,7 @@ final class EmailValidatorTest extends TestCase {
$this->assertNotSame(['error.email_too_long'], $model->getErrors('field'));
}
public function testValidateAttributeEmailCaseNotExistsDomain() {
public function testValidateAttributeEmailCaseNotExistsDomain(): void {
$this->getFunctionMock(YiiEmailValidator::class, 'checkdnsrr')->expects($this->any())->willReturn(false);
$this->getFunctionMock(YiiEmailValidator::class, 'dns_get_record')->expects($this->never());
@@ -71,7 +73,7 @@ final class EmailValidatorTest extends TestCase {
$this->assertSame(['error.email_invalid'], $model->getErrors('field'));
}
public function testValidateAttributeEmailCaseExistsDomainButWithoutMXRecord() {
public function testValidateAttributeEmailCaseExistsDomainButWithoutMXRecord(): void {
$this->getFunctionMock(YiiEmailValidator::class, 'checkdnsrr')->expects($this->exactly(2))->willReturnOnConsecutiveCalls(false, true);
$this->getFunctionMock(YiiEmailValidator::class, 'dns_get_record')->expects($this->any())->willReturn(['127.0.0.1']);
@@ -80,7 +82,7 @@ final class EmailValidatorTest extends TestCase {
$this->assertNotSame(['error.email_invalid'], $model->getErrors('field'));
}
public function testValidateAttributeEmailCaseExistsDomainWithMXRecord() {
public function testValidateAttributeEmailCaseExistsDomainWithMXRecord(): void {
$this->getFunctionMock(YiiEmailValidator::class, 'checkdnsrr')->expects($this->any())->willReturn(true);
$this->getFunctionMock(YiiEmailValidator::class, 'dns_get_record')->expects($this->any())->willReturn(['mx.google.com']);
@@ -98,7 +100,7 @@ final class EmailValidatorTest extends TestCase {
$this->assertSame(['error.email_invalid'], $model->getErrors('field'));
}
public function testValidateAttributeTempmail() {
public function testValidateAttributeTempmail(): void {
$this->getFunctionMock(YiiEmailValidator::class, 'checkdnsrr')->expects($this->any())->willReturn(true);
$this->getFunctionMock(YiiEmailValidator::class, 'dns_get_record')->expects($this->any())->willReturn(['127.0.0.1']);
@@ -114,7 +116,7 @@ final class EmailValidatorTest extends TestCase {
/**
* @dataProvider getValidateAttributeBlacklistedHostTestCases
*/
public function testValidateAttributeBlacklistedHost(string $email, bool $expectValid) {
public function testValidateAttributeBlacklistedHost(string $email, bool $expectValid): void {
$this->getFunctionMock(YiiEmailValidator::class, 'checkdnsrr')->expects($this->any())->willReturn(true);
$this->getFunctionMock(YiiEmailValidator::class, 'dns_get_record')->expects($this->any())->willReturn(['127.0.0.1']);
@@ -128,7 +130,7 @@ final class EmailValidatorTest extends TestCase {
}
}
public function getValidateAttributeBlacklistedHostTestCases() {
public static function getValidateAttributeBlacklistedHostTestCases(): Generator {
yield 'seznam.cz' => ['user@seznam.cz', false];
yield 'valid' => ['valid@google.com', true];
}
@@ -136,7 +138,7 @@ final class EmailValidatorTest extends TestCase {
/**
* @dataProvider getValidateAttributeIdnaTestCases
*/
public function testValidateAttributeIdna(string $input, string $expectedOutput) {
public function testValidateAttributeIdna(string $input, string $expectedOutput): void {
$this->getFunctionMock(YiiEmailValidator::class, 'checkdnsrr')->expects($this->any())->willReturn(true);
$this->getFunctionMock(YiiEmailValidator::class, 'dns_get_record')->expects($this->any())->willReturn(['127.0.0.1']);
@@ -145,13 +147,13 @@ final class EmailValidatorTest extends TestCase {
$this->assertSame($expectedOutput, $model->field);
}
public function getValidateAttributeIdnaTestCases() {
public static function getValidateAttributeIdnaTestCases(): Generator {
yield ['qdushyantasunassm@❕.gq', 'qdushyantasunassm@xn--bei.gq'];
yield ['Rafaelaabraão@gmail.com', 'xn--rafaelaabrao-dcb@gmail.com'];
yield ['valid-email@gmail.com', 'valid-email@gmail.com'];
}
public function testValidateAttributeUnique() {
public function testValidateAttributeUnique(): void {
$this->getFunctionMock(YiiEmailValidator::class, 'checkdnsrr')->expects($this->any())->willReturn(true);
$this->getFunctionMock(YiiEmailValidator::class, 'dns_get_record')->expects($this->any())->willReturn(['127.0.0.1']);
@@ -159,7 +161,7 @@ final class EmailValidatorTest extends TestCase {
'accounts' => AccountFixture::class,
]);
/** @var \common\models\Account $accountFixture */
/** @var Account $accountFixture */
$accountFixture = $this->tester->grabFixture('accounts', 'admin');
$model = $this->createModel($accountFixture->email);
@@ -167,9 +169,7 @@ final class EmailValidatorTest extends TestCase {
$this->assertSame(['error.email_not_available'], $model->getErrors('field'));
$model = $this->createModel($accountFixture->email);
$this->validator->accountCallback = function() use ($accountFixture) {
return $accountFixture->id;
};
$this->validator->accountCallback = fn() => $accountFixture->id;
$this->validator->validateAttribute($model, 'field');
$this->assertNotSame(['error.email_not_available'], $model->getErrors('field'));
$this->validator->accountCallback = null;
@@ -180,12 +180,11 @@ final class EmailValidatorTest extends TestCase {
}
/**
* @param string $fieldValue
* @return Model
* @return Model&object{ field: mixed }
*/
private function createModel(string $fieldValue): Model {
$class = new class extends Model {
public $field;
public string $field;
};
$class->field = $fieldValue;

4
common/tests/unit/validators/MinecraftServerAddressValidatorTest.php
View File

@@ -9,7 +9,7 @@ class MinecraftServerAddressValidatorTest extends TestCase {
/**
* @dataProvider domainNames
*/
public function testValidate($address, $shouldBeValid) {
public function testValidate(string $address, bool $shouldBeValid): void {
$validator = new MinecraftServerAddressValidator();
$validator->message = 'mock message';
$validator->validate($address, $errors);
@@ -20,7 +20,7 @@ class MinecraftServerAddressValidatorTest extends TestCase {
}
}
public function domainNames() {
public function domainNames(): array {
return [
['localhost', true],
['localhost:25565', true],

25
common/tests/unit/validators/UsernameValidatorTest.php
View File

@@ -8,24 +8,21 @@ use yii\base\Model;
class UsernameValidatorTest extends TestCase {
/**
* @var UsernameValidator
*/
private $validator;
private UsernameValidator $validator;
public function _before() {
public function _before(): void {
parent::_before();
$this->validator = new UsernameValidator();
}
public function testValidateTrimming() {
public function testValidateTrimming(): void {
$model = $this->createModel("HereIsJohnny#\u{feff}"); // Zero width no-break space (U+FEFF)
$this->validator->validateAttribute($model, 'field');
$this->assertSame(['error.username_invalid'], $model->getErrors('field'));
$this->assertSame('HereIsJohnny#', $model->field);
}
public function testValidateAttributeRequired() {
public function testValidateAttributeRequired(): void {
$model = $this->createModel('');
$this->validator->validateAttribute($model, 'field');
$this->assertSame(['error.username_required'], $model->getErrors('field'));
@@ -35,7 +32,7 @@ class UsernameValidatorTest extends TestCase {
$this->assertNotSame(['error.username_required'], $model->getErrors('field'));
}
public function testValidateAttributeLength() {
public function testValidateAttributeLength(): void {
$model = $this->createModel('at');
$this->validator->validateAttribute($model, 'field');
$this->assertSame(['error.username_too_short'], $model->getErrors('field'));
@@ -51,7 +48,7 @@ class UsernameValidatorTest extends TestCase {
}
// TODO: rewrite this test with @provider usage
public function testValidateAttributePattern() {
public function testValidateAttributePattern(): void {
$shouldBeValid = [
'русский_ник', 'русский_ник_на_грани!', 'numbers1132', '*__*-Stars-*__*', '1-_.!$%^&*()[]',
'[ESP]Эрик', 'Свят_помидор;', 'зроблена_ў_беларусі:)',
@@ -72,7 +69,7 @@ class UsernameValidatorTest extends TestCase {
}
}
public function testValidateAttributeUnique() {
public function testValidateAttributeUnique(): void {
$this->tester->haveFixtures([
'accounts' => AccountFixture::class,
]);
@@ -85,9 +82,7 @@ class UsernameValidatorTest extends TestCase {
$this->assertSame(['error.username_not_available'], $model->getErrors('field'));
$model = $this->createModel($accountFixture->username);
$this->validator->accountCallback = function() use ($accountFixture) {
return $accountFixture->id;
};
$this->validator->accountCallback = fn() => $accountFixture->id;
$this->validator->validateAttribute($model, 'field');
$this->assertNotSame(['error.username_not_available'], $model->getErrors('field'));
$this->validator->accountCallback = null;
@@ -99,11 +94,11 @@ class UsernameValidatorTest extends TestCase {
/**
* @param string $fieldValue
* @return Model
* @return Model&object{ field: string }
*/
private function createModel(string $fieldValue): Model {
$class = new class extends Model {
public $field;
public string $field;
};
$class->field = $fieldValue;