Fix codestyle

.php_cs.dist

@@ -5,6 +5,7 @@ $finder = \PhpCsFixer\Finder::create()
     ->exclude('docker')
     ->exclude('frontend')
     ->notPath('common/emails/views')
+    ->notPath('common/mail/layouts')
     ->notPath('/.*\/runtime/')
     ->notPath('autocompletion.php')
     ->notPath('tests/codeception/_output')

api/tests/functional/LoginCest.php

@@ -1,9 +1,9 @@
 <?php
 namespace api\tests\functional;
 
+use api\tests\_pages\AuthenticationRoute;
 use api\tests\FunctionalTester;
 use OTPHP\TOTP;
-use api\tests\_pages\AuthenticationRoute;
 
 class LoginCest {
 

api/tests/functional/RegisterCest.php

@@ -1,9 +1,9 @@
 <?php
 namespace api\tests\functional;
 
-use Codeception\Example;
 use api\tests\_pages\SignupRoute;
 use api\tests\FunctionalTester;
+use Codeception\Example;
 
 class RegisterCest {
 

api/tests/functional/_steps/AuthserverSteps.php

@@ -3,9 +3,9 @@ declare(strict_types=1);
 
 namespace api\tests\functional\_steps;
 
-use Ramsey\Uuid\Uuid;
 use api\tests\_pages\AuthserverRoute;
 use api\tests\FunctionalTester;
+use Ramsey\Uuid\Uuid;
 
 class AuthserverSteps extends FunctionalTester {
 

api/tests/functional/_steps/SessionServerSteps.php

@@ -1,10 +1,10 @@
 <?php
 namespace api\tests\functional\_steps;
 
-use common\rbac\Permissions as P;
-use Faker\Provider\Uuid;
 use api\tests\_pages\SessionServerRoute;
 use api\tests\FunctionalTester;
+use common\rbac\Permissions as P;
+use Faker\Provider\Uuid;
 
 class SessionServerSteps extends FunctionalTester {
 

api/tests/functional/accounts/BanCest.php

@@ -1,10 +1,10 @@
 <?php
 namespace api\tests\functional\accounts;
 
-use common\rbac\Permissions as P;
 use api\tests\_pages\AccountsRoute;
 use api\tests\functional\_steps\OauthSteps;
 use api\tests\FunctionalTester;
+use common\rbac\Permissions as P;
 
 class BanCest {
 

api/tests/functional/accounts/ChangePasswordCest.php

@@ -1,11 +1,11 @@
 <?php
 namespace api\tests\functional\accounts;
 
-use common\models\Account;
 use api\tests\_pages\AccountsRoute;
 use api\tests\_pages\AuthenticationRoute;
 use api\tests\functional\_steps\OauthSteps;
 use api\tests\FunctionalTester;
+use common\models\Account;
 
 class ChangePasswordCest {
 

api/tests/functional/accounts/ChangeUsernameCest.php

@@ -1,10 +1,10 @@
 <?php
 namespace api\tests\functional\accounts;
 
-use common\models\Account;
 use api\tests\_pages\AccountsRoute;
 use api\tests\functional\_steps\OauthSteps;
 use api\tests\FunctionalTester;
+use common\models\Account;
 
 class ChangeUsernameCest {
 

api/tests/functional/accounts/DisableTwoFactorAuthCest.php

@@ -1,9 +1,9 @@
 <?php
 namespace api\tests\functional\accounts;
 
-use OTPHP\TOTP;
 use api\tests\_pages\AccountsRoute;
 use api\tests\FunctionalTester;
+use OTPHP\TOTP;
 
 class DisableTwoFactorAuthCest {
 

api/tests/functional/accounts/EnableTwoFactorAuthCest.php

@@ -1,9 +1,9 @@
 <?php
 namespace api\tests\functional\accounts;
 
-use OTPHP\TOTP;
 use api\tests\_pages\AccountsRoute;
 use api\tests\FunctionalTester;
+use OTPHP\TOTP;
 
 class EnableTwoFactorAuthCest {
 

api/tests/functional/accounts/PardonCest.php

@@ -1,10 +1,10 @@
 <?php
 namespace api\tests\functional\accounts;
 
-use common\rbac\Permissions as P;
 use api\tests\_pages\AccountsRoute;
 use api\tests\functional\_steps\OauthSteps;
 use api\tests\FunctionalTester;
+use common\rbac\Permissions as P;
 
 class PardonCest {
 

api/tests/functional/authserver/AuthorizationCest.php

@@ -1,9 +1,9 @@
 <?php
 namespace api\tests\functional\authserver;
 
-use Ramsey\Uuid\Uuid;
 use api\tests\_pages\AuthserverRoute;
 use api\tests\FunctionalTester;
+use Ramsey\Uuid\Uuid;
 
 class AuthorizationCest {
 

api/tests/functional/authserver/InvalidateCest.php

@@ -1,9 +1,9 @@
 <?php
 namespace api\tests\functional\authserver;
 
-use Ramsey\Uuid\Uuid;
 use api\tests\_pages\AuthserverRoute;
 use api\tests\functional\_steps\AuthserverSteps;
+use Ramsey\Uuid\Uuid;
 
 class InvalidateCest {
 

api/tests/functional/authserver/RefreshCest.php

@@ -1,9 +1,9 @@
 <?php
 namespace api\tests\functional\authserver;
 
-use Ramsey\Uuid\Uuid;
 use api\tests\_pages\AuthserverRoute;
 use api\tests\functional\_steps\AuthserverSteps;
+use Ramsey\Uuid\Uuid;
 
 class RefreshCest {
 

api/tests/functional/authserver/ValidateCest.php

@@ -1,9 +1,9 @@
 <?php
 namespace api\tests\functional\authserver;
 
-use Ramsey\Uuid\Uuid;
 use api\tests\_pages\AuthserverRoute;
 use api\tests\functional\_steps\AuthserverSteps;
+use Ramsey\Uuid\Uuid;
 
 class ValidateCest {
 

api/tests/functional/mojang/UuidToUsernamesHistoryCest.php

@@ -1,9 +1,9 @@
 <?php
 namespace api\tests\functional\authserver;
 
-use Faker\Provider\Uuid;
 use api\tests\_pages\MojangApiRoute;
 use api\tests\FunctionalTester;
+use Faker\Provider\Uuid;
 
 class UuidToUsernamesHistoryCest {
 

api/tests/functional/oauth/AuthCodeCest.php

@@ -1,9 +1,9 @@
 <?php
 namespace api\tests\functional\oauth;
 
-use common\rbac\Permissions as P;
 use api\tests\_pages\OauthRoute;
 use api\tests\FunctionalTester;
+use common\rbac\Permissions as P;
 
 class AuthCodeCest {
 

api/tests/functional/oauth/RefreshTokenCest.php

@@ -2,10 +2,10 @@
 namespace api\tests\functional\oauth;
 
 use api\components\OAuth2\Storage\ScopeStorage as S;
-use common\rbac\Permissions as P;
 use api\tests\_pages\OauthRoute;
 use api\tests\functional\_steps\OauthSteps;
 use api\tests\FunctionalTester;
+use common\rbac\Permissions as P;
 
 class RefreshTokenCest {
 

api/tests/functional/sessionserver/HasJoinedCest.php

@@ -1,10 +1,10 @@
 <?php
 namespace api\tests\functional\sessionserver;
 
-use Faker\Provider\Uuid;
 use api\tests\_pages\SessionServerRoute;
 use api\tests\functional\_steps\SessionServerSteps;
 use api\tests\FunctionalTester;
+use Faker\Provider\Uuid;
 
 class HasJoinedCest {
 

api/tests/functional/sessionserver/HasJoinedLegacyCest.php

@@ -1,10 +1,10 @@
 <?php
 namespace api\tests\functional\sessionserver;
 
-use Faker\Provider\Uuid;
 use api\tests\_pages\SessionServerRoute;
 use api\tests\functional\_steps\SessionServerSteps;
 use api\tests\FunctionalTester;
+use Faker\Provider\Uuid;
 
 class HasJoinedLegacyCest {
 

api/tests/functional/sessionserver/JoinCest.php

@@ -1,12 +1,12 @@
 <?php
 namespace api\tests\functional\sessionserver;
 
-use common\rbac\Permissions as P;
-use Faker\Provider\Uuid;
 use api\tests\_pages\SessionServerRoute;
 use api\tests\functional\_steps\AuthserverSteps;
 use api\tests\functional\_steps\OauthSteps;
 use api\tests\FunctionalTester;
+use common\rbac\Permissions as P;
+use Faker\Provider\Uuid;
 
 class JoinCest {
 

api/tests/functional/sessionserver/JoinLegacyCest.php

@@ -1,12 +1,12 @@
 <?php
 namespace api\tests\functional\sessionserver;
 
-use common\rbac\Permissions as P;
-use Faker\Provider\Uuid;
 use api\tests\_pages\SessionServerRoute;
 use api\tests\functional\_steps\AuthserverSteps;
 use api\tests\functional\_steps\OauthSteps;
 use api\tests\FunctionalTester;
+use common\rbac\Permissions as P;
+use Faker\Provider\Uuid;
 
 class JoinLegacyCest {
 

api/tests/functional/sessionserver/ProfileCest.php

@@ -1,10 +1,10 @@
 <?php
 namespace api\tests\functional\sessionserver;
 
-use Faker\Provider\Uuid;
 use api\tests\_pages\SessionServerRoute;
 use api\tests\functional\_steps\SessionServerSteps;
 use api\tests\FunctionalTester;
+use Faker\Provider\Uuid;
 
 class ProfileCest {
 

api/tests/unit/components/ReCaptcha/ValidatorTest.php

@@ -2,12 +2,12 @@
 namespace codeception\api\unit\components\ReCaptcha;
 
 use api\components\ReCaptcha\Validator;
+use api\tests\unit\TestCase;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Psr7\Response;
 use phpmock\mockery\PHPMockery;
 use ReflectionClass;
-use api\tests\unit\TestCase;
 
 class ValidatorTest extends TestCase {
 

api/tests/unit/components/User/ComponentTest.php

@@ -4,16 +4,16 @@ namespace codeception\api\unit\components\User;
 use api\components\User\AuthenticationResult;
 use api\components\User\Component;
 use api\components\User\Identity;
+use api\tests\unit\TestCase;
 use common\models\Account;
 use common\models\AccountSession;
-use Emarref\Jwt\Claim;
-use Emarref\Jwt\Jwt;
-use Emarref\Jwt\Token;
-use api\tests\unit\TestCase;
 use common\tests\_support\ProtectedCaller;
 use common\tests\fixtures\AccountFixture;
 use common\tests\fixtures\AccountSessionFixture;
 use common\tests\fixtures\MinecraftAccessKeyFixture;
+use Emarref\Jwt\Claim;
+use Emarref\Jwt\Jwt;
+use Emarref\Jwt\Token;
 use Yii;
 use yii\web\Request;
 

api/tests/unit/components/User/JwtAuthenticationResultTest.php

@@ -2,6 +2,7 @@
 namespace api\tests\unit\components\User;
 
 use api\components\User\AuthenticationResult;
+use api\tests\unit\TestCase;
 use common\models\Account;
 use common\models\AccountSession;
 use Emarref\Jwt\Algorithm\Hs256;
@@ -9,7 +10,6 @@ use Emarref\Jwt\Claim\Expiration;
 use Emarref\Jwt\Encryption\Factory as EncryptionFactory;
 use Emarref\Jwt\Jwt;
 use Emarref\Jwt\Token;
-use api\tests\unit\TestCase;
 
 class JwtAuthenticationResultTest extends TestCase {
 

api/tests/unit/models/FeedbackFormTest.php

@@ -2,8 +2,8 @@
 namespace codeception\api\unit\models;
 
 use api\models\FeedbackForm;
-use common\models\Account;
 use api\tests\unit\TestCase;
+use common\models\Account;
 use yii\swiftmailer\Message;
 
 class FeedbackFormTest extends TestCase {

api/tests/unit/models/JwtIdentityTest.php

@@ -4,13 +4,13 @@ namespace codeception\api\unit\models;
 use api\components\User\IdentityInterface;
 use api\components\User\Jwt;
 use api\components\User\JwtIdentity;
+use api\tests\unit\TestCase;
 use Codeception\Specify;
+use common\tests\_support\ProtectedCaller;
+use common\tests\fixtures\AccountFixture;
 use Emarref\Jwt\Claim;
 use Emarref\Jwt\Encryption\Factory as EncryptionFactory;
 use Emarref\Jwt\Token;
-use api\tests\unit\TestCase;
-use common\tests\_support\ProtectedCaller;
-use common\tests\fixtures\AccountFixture;
 use Yii;
 
 class JwtIdentityTest extends TestCase {

api/tests/unit/models/authentication/ConfirmEmailFormTest.php

@@ -3,10 +3,10 @@ namespace api\tests\_support\models\authentication;
 
 use api\components\User\AuthenticationResult;
 use api\models\authentication\ConfirmEmailForm;
+use api\tests\unit\TestCase;
 use common\models\Account;
 use common\models\AccountSession;
 use common\models\EmailActivation;
-use api\tests\unit\TestCase;
 use common\tests\fixtures\EmailActivationFixture;
 
 class ConfirmEmailFormTest extends TestCase {

api/tests/unit/models/authentication/ForgotPasswordFormTest.php

@@ -3,14 +3,14 @@ namespace codeception\api\unit\models\authentication;
 
 use api\components\ReCaptcha\Validator as ReCaptchaValidator;
 use api\models\authentication\ForgotPasswordForm;
+use api\tests\unit\TestCase;
 use Codeception\Specify;
 use common\models\Account;
 use common\models\EmailActivation;
 use common\tasks\SendPasswordRecoveryEmail;
-use GuzzleHttp\ClientInterface;
-use api\tests\unit\TestCase;
 use common\tests\fixtures\AccountFixture;
 use common\tests\fixtures\EmailActivationFixture;
+use GuzzleHttp\ClientInterface;
 use Yii;
 
 class ForgotPasswordFormTest extends TestCase {

api/tests/unit/models/authentication/LoginFormTest.php

@@ -3,11 +3,11 @@ namespace api\tests\_support\models\authentication;
 
 use api\components\User\AuthenticationResult;
 use api\models\authentication\LoginForm;
+use api\tests\unit\TestCase;
 use Codeception\Specify;
 use common\models\Account;
-use OTPHP\TOTP;
-use api\tests\unit\TestCase;
 use common\tests\fixtures\AccountFixture;
+use OTPHP\TOTP;
 
 class LoginFormTest extends TestCase {
     use Specify;

api/tests/unit/models/authentication/LogoutFormTest.php

@@ -4,9 +4,9 @@ namespace api\tests\_support\models\authentication;
 use api\components\User\Component;
 use api\components\User\Identity;
 use api\models\authentication\LogoutForm;
+use api\tests\unit\TestCase;
 use Codeception\Specify;
 use common\models\AccountSession;
-use api\tests\unit\TestCase;
 use Yii;
 
 class LogoutFormTest extends TestCase {

api/tests/unit/models/authentication/RecoverPasswordFormTest.php

@@ -3,10 +3,10 @@ namespace api\tests\_support\models\authentication;
 
 use api\components\User\AuthenticationResult;
 use api\models\authentication\RecoverPasswordForm;
+use api\tests\unit\TestCase;
 use Codeception\Specify;
 use common\models\Account;
 use common\models\EmailActivation;
-use api\tests\unit\TestCase;
 use common\tests\fixtures\EmailActivationFixture;
 
 class RecoverPasswordFormTest extends TestCase {

api/tests/unit/models/authentication/RefreshTokenFormTest.php

@@ -3,9 +3,9 @@ namespace codeception\api\unit\models\authentication;
 
 use api\components\User\AuthenticationResult;
 use api\models\authentication\RefreshTokenForm;
+use api\tests\unit\TestCase;
 use Codeception\Specify;
 use common\models\AccountSession;
-use api\tests\unit\TestCase;
 use common\tests\fixtures\AccountSessionFixture;
 
 class RefreshTokenFormTest extends TestCase {

api/tests/unit/models/authentication/RegistrationFormTest.php

@@ -3,16 +3,16 @@ namespace api\tests\_support\models\authentication;
 
 use api\components\ReCaptcha\Validator as ReCaptchaValidator;
 use api\models\authentication\RegistrationForm;
+use api\tests\unit\TestCase;
 use common\models\Account;
 use common\models\EmailActivation;
 use common\models\UsernameHistory;
 use common\tasks\SendRegistrationEmail;
-use GuzzleHttp\ClientInterface;
-use api\tests\unit\TestCase;
 use common\tests\fixtures\AccountFixture;
 use common\tests\fixtures\EmailActivationFixture;
 use common\tests\fixtures\UsernameHistoryFixture;
 use common\tests\helpers\Mock;
+use GuzzleHttp\ClientInterface;
 use Yii;
 use yii\validators\EmailValidator;
 use yii\web\Request;

api/tests/unit/models/authentication/RepeatAccountActivationFormTest.php

@@ -3,13 +3,13 @@ namespace api\tests\_support\models\authentication;
 
 use api\components\ReCaptcha\Validator as ReCaptchaValidator;
 use api\models\authentication\RepeatAccountActivationForm;
+use api\tests\unit\TestCase;
 use Codeception\Specify;
 use common\models\EmailActivation;
 use common\tasks\SendRegistrationEmail;
-use GuzzleHttp\ClientInterface;
-use api\tests\unit\TestCase;
 use common\tests\fixtures\AccountFixture;
 use common\tests\fixtures\EmailActivationFixture;
+use GuzzleHttp\ClientInterface;
 use Yii;
 
 class RepeatAccountActivationFormTest extends TestCase {

api/tests/unit/modules/accounts/models/AcceptRulesFormTest.php

@@ -2,8 +2,8 @@
 namespace api\tests\unit\modules\accounts\models;
 
 use api\modules\accounts\models\AcceptRulesForm;
-use common\models\Account;
 use api\tests\unit\TestCase;
+use common\models\Account;
 use const common\LATEST_RULES_VERSION;
 
 class AcceptRulesFormTest extends TestCase {

api/tests/unit/modules/accounts/models/ChangeEmailFormTest.php

@@ -2,9 +2,9 @@
 namespace api\tests\unit\modules\accounts\models;
 
 use api\modules\accounts\models\ChangeEmailForm;
+use api\tests\unit\TestCase;
 use common\models\Account;
 use common\models\EmailActivation;
-use api\tests\unit\TestCase;
 use common\tests\fixtures\AccountFixture;
 use common\tests\fixtures\EmailActivationFixture;
 

api/tests/unit/modules/accounts/models/ChangeLanguageFormTest.php

@@ -2,8 +2,8 @@
 namespace api\tests\unit\modules\accounts\models;
 
 use api\modules\accounts\models\ChangeLanguageForm;
-use common\models\Account;
 use api\tests\unit\TestCase;
+use common\models\Account;
 
 class ChangeLanguageFormTest extends TestCase {
 

api/tests/unit/modules/accounts/models/ChangePasswordFormTest.php

@@ -4,10 +4,10 @@ namespace api\tests\unit\modules\accounts\models;
 use api\components\User\Component;
 use api\components\User\Identity;
 use api\modules\accounts\models\ChangePasswordForm;
+use api\tests\unit\TestCase;
 use common\components\UserPass;
 use common\helpers\Error as E;
 use common\models\Account;
-use api\tests\unit\TestCase;
 use Yii;
 use yii\db\Transaction;
 

api/tests/unit/modules/accounts/models/ChangeUsernameFormTest.php

@@ -2,10 +2,10 @@
 namespace api\tests\unit\modules\accounts\models;
 
 use api\modules\accounts\models\ChangeUsernameForm;
+use api\tests\unit\TestCase;
 use common\models\Account;
 use common\models\UsernameHistory;
 use common\tasks\PullMojangUsername;
-use api\tests\unit\TestCase;
 use common\tests\fixtures\AccountFixture;
 use common\tests\fixtures\UsernameHistoryFixture;
 

api/tests/unit/modules/accounts/models/DisableTwoFactorAuthFormTest.php

@@ -2,9 +2,9 @@
 namespace api\tests\unit\modules\accounts\models;
 
 use api\modules\accounts\models\DisableTwoFactorAuthForm;
+use api\tests\unit\TestCase;
 use common\helpers\Error as E;
 use common\models\Account;
-use api\tests\unit\TestCase;
 
 class DisableTwoFactorAuthFormTest extends TestCase {
 

api/tests/unit/modules/accounts/models/EnableTwoFactorAuthFormTest.php

@@ -4,9 +4,9 @@ namespace api\tests\unit\modules\accounts\models;
 use api\components\User\Component;
 use api\components\User\Identity;
 use api\modules\accounts\models\EnableTwoFactorAuthForm;
+use api\tests\unit\TestCase;
 use common\helpers\Error as E;
 use common\models\Account;
-use api\tests\unit\TestCase;
 use Yii;
 
 class EnableTwoFactorAuthFormTest extends TestCase {

api/tests/unit/modules/accounts/models/SendEmailVerificationFormTest.php

@@ -2,11 +2,11 @@
 namespace api\tests\unit\modules\accounts\models;
 
 use api\modules\accounts\models\SendEmailVerificationForm;
+use api\tests\unit\TestCase;
 use common\models\Account;
 use common\models\confirmations\CurrentEmailConfirmation;
 use common\models\EmailActivation;
 use common\tasks\SendCurrentEmailConfirmation;
-use api\tests\unit\TestCase;
 use common\tests\fixtures\AccountFixture;
 use common\tests\fixtures\EmailActivationFixture;
 

api/tests/unit/modules/accounts/models/SendNewEmailVerificationFormTest.php

@@ -2,11 +2,11 @@
 namespace api\tests\unit\modules\accounts\models;
 
 use api\modules\accounts\models\SendNewEmailVerificationForm;
+use api\tests\unit\TestCase;
 use common\models\Account;
 use common\models\confirmations\NewEmailConfirmation;
 use common\models\EmailActivation;
 use common\tasks\SendNewEmailConfirmation;
-use api\tests\unit\TestCase;
 use common\tests\fixtures\AccountFixture;
 use common\tests\fixtures\EmailActivationFixture;
 use common\tests\helpers\Mock;

api/tests/unit/modules/accounts/models/TwoFactorAuthInfoTest.php

@@ -2,8 +2,8 @@
 namespace api\tests\unit\modules\accounts\models;
 
 use api\modules\accounts\models\TwoFactorAuthInfo;
-use common\models\Account;
 use api\tests\unit\TestCase;
+use common\models\Account;
 
 class TwoFactorAuthInfoTest extends TestCase {
 

api/tests/unit/modules/authserver/models/AuthenticationFormTest.php

@@ -4,13 +4,13 @@ namespace codeception\api\unit\modules\authserver\models;
 use api\models\authentication\LoginForm;
 use api\modules\authserver\models\AuthenticateData;
 use api\modules\authserver\models\AuthenticationForm;
+use api\tests\unit\TestCase;
 use common\models\Account;
 use common\models\MinecraftAccessKey;
-use Ramsey\Uuid\Uuid;
-use api\tests\unit\TestCase;
 use common\tests\_support\ProtectedCaller;
 use common\tests\fixtures\AccountFixture;
 use common\tests\fixtures\MinecraftAccessKeyFixture;
+use Ramsey\Uuid\Uuid;
 
 class AuthenticationFormTest extends TestCase {
     use ProtectedCaller;

api/tests/unit/modules/internal/models/BanFormTest.php

@@ -3,9 +3,9 @@ namespace api\tests\unit\modules\internal\models;
 
 use api\modules\accounts\models\BanAccountForm;
 use api\modules\internal\helpers\Error as E;
+use api\tests\unit\TestCase;
 use common\models\Account;
 use common\tasks\ClearAccountSessions;
-use api\tests\unit\TestCase;
 
 class BanFormTest extends TestCase {
 

api/tests/unit/modules/internal/models/PardonFormTest.php

@@ -3,8 +3,8 @@ namespace api\tests\unit\modules\internal\models;
 
 use api\modules\accounts\models\PardonAccountForm;
 use api\modules\internal\helpers\Error as E;
-use common\models\Account;
 use api\tests\unit\TestCase;
+use common\models\Account;
 
 class PardonFormTest extends TestCase {
 

api/tests/unit/modules/oauth/models/ApplicationTypeTest.php

@@ -2,8 +2,8 @@
 namespace api\tests\unit\modules\oauth\models;
 
 use api\modules\oauth\models\ApplicationType;
-use common\models\OauthClient;
 use api\tests\unit\TestCase;
+use common\models\OauthClient;
 
 class ApplicationTypeTest extends TestCase {
 

api/tests/unit/modules/oauth/models/BaseOauthClientTypeTest.php

@@ -2,8 +2,8 @@
 namespace api\tests\unit\modules\oauth\models;
 
 use api\modules\oauth\models\BaseOauthClientType;
-use common\models\OauthClient;
 use api\tests\unit\TestCase;
+use common\models\OauthClient;
 
 class BaseOauthClientTypeTest extends TestCase {
 

api/tests/unit/modules/oauth/models/MinecraftServerTypeTest.php

@@ -2,8 +2,8 @@
 namespace api\tests\unit\modules\oauth\models;
 
 use api\modules\oauth\models\MinecraftServerType;
-use common\models\OauthClient;
 use api\tests\unit\TestCase;
+use common\models\OauthClient;
 
 class MinecraftServerTypeTest extends TestCase {
 

api/tests/unit/modules/oauth/models/OauthClientFormFactoryTest.php

@@ -4,8 +4,8 @@ namespace api\tests\unit\modules\oauth\models;
 use api\modules\oauth\models\ApplicationType;
 use api\modules\oauth\models\MinecraftServerType;
 use api\modules\oauth\models\OauthClientFormFactory;
-use common\models\OauthClient;
 use api\tests\unit\TestCase;
+use common\models\OauthClient;
 
 class OauthClientFormFactoryTest extends TestCase {
 

api/tests/unit/modules/oauth/models/OauthClientFormTest.php

@@ -3,9 +3,9 @@ namespace api\tests\unit\modules\oauth\models;
 
 use api\modules\oauth\models\OauthClientForm;
 use api\modules\oauth\models\OauthClientTypeForm;
+use api\tests\unit\TestCase;
 use common\models\OauthClient;
 use common\tasks\ClearOauthSessions;
-use api\tests\unit\TestCase;
 
 class OauthClientFormTest extends TestCase {
 

api/tests/unit/modules/session/filters/RateLimiterTest.php

@@ -4,9 +4,9 @@ declare(strict_types=1);
 namespace api\tests\unit\modules\session\filters;
 
 use api\modules\session\filters\RateLimiter;
+use api\tests\unit\TestCase;
 use common\models\OauthClient;
 use Faker\Provider\Internet;
-use api\tests\unit\TestCase;
 use Yii;
 use yii\redis\Connection;
 use yii\web\Request;

api/tests/unit/traits/AccountFinderTest.php

@@ -1,10 +1,10 @@
 <?php
 namespace api\tests\_support\traits;
 
+use api\tests\unit\TestCase;
 use api\traits\AccountFinder;
 use Codeception\Specify;
 use common\models\Account;
-use api\tests\unit\TestCase;
 use common\tests\fixtures\AccountFixture;
 
 class AccountFinderTest extends TestCase {

api/tests/unit/validators/EmailActivationKeyValidatorTest.php

@@ -1,12 +1,12 @@
 <?php
 namespace codeception\api\unit\validators;
 
+use api\tests\unit\TestCase;
 use api\validators\EmailActivationKeyValidator;
 use Codeception\Specify;
 use common\helpers\Error as E;
 use common\models\confirmations\ForgotPassword;
 use common\models\EmailActivation;
-use api\tests\unit\TestCase;
 use common\tests\_support\ProtectedCaller;
 use common\tests\fixtures\EmailActivationFixture;
 use yii\base\Model;

api/tests/unit/validators/PasswordRequiredValidatorTest.php

@@ -1,11 +1,11 @@
 <?php
 namespace codeception\api\unit\validators;
 
+use api\tests\unit\TestCase;
 use api\validators\PasswordRequiredValidator;
 use common\helpers\Error as E;
 use common\models\Account;
 use common\rbac\Permissions as P;
-use api\tests\unit\TestCase;
 use common\tests\_support\ProtectedCaller;
 use yii\web\User;
 

api/tests/unit/validators/TotpValidatorTest.php

@@ -1,12 +1,12 @@
 <?php
 namespace api\tests\unit\validators;
 
+use api\tests\unit\TestCase;
 use api\validators\TotpValidator;
 use common\helpers\Error as E;
 use common\models\Account;
-use OTPHP\TOTP;
-use api\tests\unit\TestCase;
 use common\tests\_support\ProtectedCaller;
+use OTPHP\TOTP;
 
 class TotpValidatorTest extends TestCase {
     use ProtectedCaller;

common/tests/unit/components/Mojang/ApiTest.php

@@ -3,11 +3,11 @@ namespace common\tests\unit\components\Mojang;
 
 use common\components\Mojang\Api;
 use common\components\Mojang\response\UsernameToUUIDResponse;
+use common\tests\unit\TestCase;
 use GuzzleHttp\Client as GuzzleClient;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
-use common\tests\unit\TestCase;
 use Yii;
 
 class ApiTest extends TestCase {

common/tests/unit/emails/TemplateWithRendererTest.php

@@ -3,9 +3,9 @@ namespace common\tests\unit\emails;
 
 use common\components\EmailRenderer;
 use common\emails\TemplateWithRenderer;
-use Ely\Email\TemplateBuilder;
 use common\tests\_support\ProtectedCaller;
 use common\tests\unit\TestCase;
+use Ely\Email\TemplateBuilder;
 use yii\mail\MailerInterface;
 use yii\mail\MessageInterface;
 

common/tests/unit/tasks/DeliveryWebHookTest.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 namespace common\tests\unit\tasks;
 
 use common\tasks\DeliveryWebHook;
+use common\tests\unit\TestCase;
 use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Exception\ServerException;
 use GuzzleHttp\Handler\MockHandler;
@@ -11,7 +12,6 @@ use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Middleware;
 use GuzzleHttp\Psr7\Request;
 use GuzzleHttp\Psr7\Response;
-use common\tests\unit\TestCase;
 use yii\queue\Queue;
 
 /**

common/tests/unit/validators/EmailValidatorTest.php

@@ -1,10 +1,10 @@
 <?php
 namespace common\tests\unit\validators;
 
-use common\validators\EmailValidator;
 use common\tests\fixtures\AccountFixture;
 use common\tests\helpers\Mock;
 use common\tests\unit\TestCase;
+use common\validators\EmailValidator;
 use yii\base\Model;
 use yii\validators\EmailValidator as YiiEmailValidator;
 

common/tests/unit/validators/LanguageValidatorTest.php

@@ -3,8 +3,8 @@ declare(strict_types=1);
 
 namespace common\tests\unit\validators;
 
-use common\validators\LanguageValidator;
 use common\tests\unit\TestCase;
+use common\validators\LanguageValidator;
 
 /**
  * @covers \common\validators\LanguageValidator

common/tests/unit/validators/MinecraftServerAddressValidatorTest.php

@@ -1,8 +1,8 @@
 <?php
 namespace common\tests\unit\validators;
 
-use common\validators\MinecraftServerAddressValidator;
 use common\tests\unit\TestCase;
+use common\validators\MinecraftServerAddressValidator;
 
 class MinecraftServerAddressValidatorTest extends TestCase {
 

common/tests/unit/validators/UsernameValidatorTest.php

@@ -1,9 +1,9 @@
 <?php
 namespace common\tests\unit\validators;
 
-use common\validators\UsernameValidator;
 use common\tests\fixtures\AccountFixture;
 use common\tests\unit\TestCase;
+use common\validators\UsernameValidator;
 use yii\base\Model;
 
 class UsernameValidatorTest extends TestCase {

common/tests/unit/validators/UuidValidatorTest.php

@@ -2,9 +2,9 @@
 namespace common\tests\unit\validators;
 
 use Codeception\Specify;
+use common\tests\unit\TestCase;
 use common\validators\UuidValidator;
 use Faker\Provider\Uuid;
-use common\tests\unit\TestCase;
 use yii\base\Model;
 
 class UuidValidatorTest extends TestCase {