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

Merge branch 'php-cs' into develop

Browse Source
This commit is contained in:
ErickSkrauch
2018-04-18 03:14:26 +03:00
parent bfdcaf2233 f09eb86e5c
commit 7d881682e5
115 changed files with 878 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -19,3 +19,7 @@ npm-debug*
# id_rsa
/id_rsa
# PHP-CS-Fixer
.php_cs
.php_cs.cache

8
.gitlab-ci.yml
View File

@@ -24,6 +24,14 @@ test:backend:
script:
- export TEMP_DEV_IMAGE="${CONTAINER_IMAGE}:ci-${CI_BUILD_ID}"
- docker build --pull -f Dockerfile-dev -t $TEMP_DEV_IMAGE .
- >
docker run --rm
$TEMP_DEV_IMAGE
bash -c "
rm /usr/local/etc/php/conf.d/xdebug.ini &&
cp -r /var/www/vendor /var/www/html/vendor &&
vendor/bin/php-cs-fixer fix -v --dry-run
"
- >
docker run --rm
--add-host=mariadb:`getent hosts mariadb | awk '{ print $1 ; exit }'`

16
.php_cs.dist Normal file
View File

@@ -0,0 +1,16 @@
<?php
$finder = \PhpCsFixer\Finder::create()
->in(__DIR__)
->exclude('data')
->exclude('docker')
->exclude('frontend')
->notPath('common/emails/views')
->notPath('/.*\/runtime/')
->notPath('autocompletion.php')
->notPath('tests/codeception/_output')
->notPath('/tests\/codeception\/.*\/_output/')
->notPath('/tests\/codeception\/.*\/_support\/_generated/')
->name('yii');
return \Ely\CS\Config::create()
->setFinder($finder);

1
api/aop/AspectKernel.php
View File

@@ -1,7 +1,6 @@
<?php
namespace api\aop;
use api\aop\aspects;
use Doctrine\Common\Annotations\AnnotationReader;
use Go\Core\AspectContainer;
use Go\Core\AspectKernel as BaseAspectKernel;

1
api/components/OAuth2/Component.php
View File

@@ -1,7 +1,6 @@
<?php
namespace api\components\OAuth2;
use api\components\OAuth2\Storage;
use League\OAuth2\Server\AuthorizationServer;
use League\OAuth2\Server\Storage\AccessTokenInterface;
use League\OAuth2\Server\Storage\RefreshTokenInterface;

10
api/components/OAuth2/Entities/RefreshTokenEntity.php
View File

@@ -9,11 +9,11 @@ class RefreshTokenEntity extends \League\OAuth2\Server\Entity\RefreshTokenEntity
private $sessionId;
public function isExpired() : bool {
public function isExpired(): bool {
return false;
}
public function getSession() : SessionEntity {
public function getSession(): SessionEntity {
if ($this->session instanceof SessionEntity) {
return $this->session;
}
@@ -26,18 +26,18 @@ class RefreshTokenEntity extends \League\OAuth2\Server\Entity\RefreshTokenEntity
return $sessionStorage->getById($this->sessionId);
}
public function getSessionId() : int {
public function getSessionId(): int {
return $this->sessionId;
}
public function setSession(OriginalSessionEntity $session) {
public function setSession(OriginalSessionEntity $session): self {
parent::setSession($session);
$this->setSessionId($session->getId());
return $this;
}
public function setSessionId(int $sessionId) {
public function setSessionId(int $sessionId): void {
$this->sessionId = $sessionId;
}

6
api/components/OAuth2/Grants/AuthCodeGrant.php
View File

@@ -133,8 +133,10 @@ class AuthCodeGrant extends AbstractGrant {
throw new Exception\InvalidRequestException('client_id');
}
$clientSecret = $this->server->getRequest()->request->get('client_secret',
$this->server->getRequest()->getPassword());
$clientSecret = $this->server->getRequest()->request->get(
'client_secret',
$this->server->getRequest()->getPassword()
);
if ($clientSecret === null && $this->shouldRequireClientSecret()) {
throw new Exception\InvalidRequestException('client_secret');
}

6
api/components/OAuth2/Storage/AccessTokenStorage.php
View File

@@ -31,7 +31,7 @@ class AccessTokenStorage extends AbstractStorage implements AccessTokenInterface
public function getScopes(OriginalAccessTokenEntity $token) {
$scopes = $this->scopes($token->getId());
$entities = [];
foreach($scopes as $scope) {
foreach ($scopes as $scope) {
if ($this->server->getScopeStorage()->get($scope) !== null) {
$entities[] = (new ScopeEntity($this->server))->hydrate(['id' => $scope]);
}
@@ -59,11 +59,11 @@ class AccessTokenStorage extends AbstractStorage implements AccessTokenInterface
$this->scopes($token->getId())->delete();
}
private function key(string $token) : Key {
private function key(string $token): Key {
return new Key($this->dataTable, $token);
}
private function scopes(string $token) : Set {
private function scopes(string $token): Set {
return new Set($this->dataTable, $token, 'scopes');
}

4
api/components/OAuth2/Storage/AuthCodeStorage.php
View File

@@ -61,11 +61,11 @@ class AuthCodeStorage extends AbstractStorage implements AuthCodeInterface {
$this->scopes($token->getId())->delete();
}
private function key(string $token) : Key {
private function key(string $token): Key {
return new Key($this->dataTable, $token);
}
private function scopes(string $token) : Set {
private function scopes(string $token): Set {
return new Set($this->dataTable, $token, 'scopes');
}

6
api/components/OAuth2/Storage/ClientStorage.php
View File

@@ -11,8 +11,8 @@ use yii\helpers\StringHelper;
class ClientStorage extends AbstractStorage implements ClientInterface {
const REDIRECT_STATIC_PAGE = 'static_page';
const REDIRECT_STATIC_PAGE_WITH_CODE = 'static_page_with_code';
private const REDIRECT_STATIC_PAGE = 'static_page';
private const REDIRECT_STATIC_PAGE_WITH_CODE = 'static_page_with_code';
/**
* @inheritdoc
@@ -66,7 +66,7 @@ class ClientStorage extends AbstractStorage implements ClientInterface {
return $this->hydrate($model);
}
private function hydrate(OauthClient $model) : ClientEntity {
private function hydrate(OauthClient $model): ClientEntity {
$entity = new ClientEntity($this->server);
$entity->setId($model->id);
$entity->setName($model->name);

4
api/components/OAuth2/Storage/RefreshTokenStorage.php
View File

@@ -51,12 +51,12 @@ class RefreshTokenStorage extends AbstractStorage implements RefreshTokenInterfa
$this->sessionHash($token->getSessionId())->remove($token->getId());
}
public function sessionHash(string $sessionId) : Set {
public function sessionHash(string $sessionId): Set {
$tableName = Yii::$app->db->getSchema()->getRawTableName(OauthSession::tableName());
return new Set($tableName, $sessionId, 'refresh_tokens');
}
private function key(string $token) : Key {
private function key(string $token): Key {
return new Key($this->dataTable, $token);
}

2
api/components/OAuth2/Storage/SessionStorage.php
View File

@@ -76,7 +76,7 @@ class SessionStorage extends AbstractStorage implements SessionInterface {
$this->getSessionModel($session->getId())->getScopes()->add($scope->getId());
}
private function getSessionModel(string $sessionId) : OauthSession {
private function getSessionModel(string $sessionId): OauthSession {
$session = OauthSession::findOne($sessionId);
if ($session === null) {
throw new ErrorException('Cannot find oauth session');

2
api/components/User/Component.php
View File

@@ -214,7 +214,7 @@ class Component extends YiiUserComponent {
protected function createToken(Account $account): Token {
$token = new Token();
foreach($this->getClaims($account) as $claim) {
foreach ($this->getClaims($account) as $claim) {
$token->addClaim($claim);
}

8
api/components/User/Identity.php
View File

@@ -18,6 +18,10 @@ class Identity implements IdentityInterface {
*/
private $_accessToken;
private function __construct(AccessTokenEntity $accessToken) {
$this->_accessToken = $accessToken;
}
/**
* @inheritdoc
* @throws \yii\web\UnauthorizedHttpException
@@ -73,10 +77,6 @@ class Identity implements IdentityInterface {
throw new NotSupportedException('This method used for cookie auth, except we using Bearer auth');
}
private function __construct(AccessTokenEntity $accessToken) {
$this->_accessToken = $accessToken;
}
private function getSession(): OauthSession {
return OauthSession::findOne($this->_accessToken->getSessionId());
}

10
api/components/User/JwtIdentity.php
View File

@@ -23,6 +23,11 @@ class JwtIdentity implements IdentityInterface {
*/
private $token;
private function __construct(string $rawToken, Token $token) {
$this->rawToken = $rawToken;
$this->token = $token;
}
public static function findIdentityByAccessToken($rawToken, $type = null): IdentityInterface {
/** @var \api\components\User\Component $component */
$component = Yii::$app->user;
@@ -86,9 +91,4 @@ class JwtIdentity implements IdentityInterface {
throw new NotSupportedException('This method used for cookie auth, except we using Bearer auth');
}
private function __construct(string $rawToken, Token $token) {
$this->rawToken = $rawToken;
$this->token = $token;
}
}

2
api/components/User/ScopesClaim.php
View File

@@ -5,7 +5,7 @@ use Emarref\Jwt\Claim\AbstractClaim;
class ScopesClaim extends AbstractClaim {
const NAME = 'ely-scopes';
public const NAME = 'ely-scopes';
/**
* ScopesClaim constructor.

2
api/components/User/SubjectPrefixVerifier.php
View File

@@ -21,7 +21,7 @@ class SubjectPrefixVerifier implements VerifierInterface {
$subject = ($subjectClaim === null) ? null : $subjectClaim->getValue();
if (!StringHelper::startsWith($subject, $this->subjectPrefix)) {
throw new InvalidSubjectException;
throw new InvalidSubjectException();
}
}

2
api/controllers/SignupController.php
View File

@@ -2,8 +2,8 @@
namespace api\controllers;
use api\models\authentication\ConfirmEmailForm;
use api\models\authentication\RepeatAccountActivationForm;
use api\models\authentication\RegistrationForm;
use api\models\authentication\RepeatAccountActivationForm;
use common\helpers\Error as E;
use Yii;
use yii\filters\AccessControl;

4
api/models/FeedbackForm.php
View File

@@ -1,8 +1,8 @@
<?php
namespace api\models;
use common\helpers\Error as E;
use api\models\base\ApiForm;
use common\helpers\Error as E;
use common\models\Account;
use Yii;
use yii\base\ErrorException;
@@ -29,7 +29,7 @@ class FeedbackForm extends ApiForm {
];
}
public function sendMessage() : bool {
public function sendMessage(): bool {
if (!$this->validate()) {
return false;
}

2
api/models/authentication/ForgotPasswordForm.php
View File

@@ -4,9 +4,9 @@ namespace api\models\authentication;
use api\aop\annotations\CollectModelMetrics;
use api\components\ReCaptcha\Validator as ReCaptchaValidator;
use api\models\base\ApiForm;
use common\helpers\Error as E;
use api\traits\AccountFinder;
use common\components\UserFriendlyRandomKey;
use common\helpers\Error as E;
use common\models\Account;
use common\models\confirmations\ForgotPassword;
use common\models\EmailActivation;

5
api/models/authentication/LoginForm.php
View File

@@ -3,9 +3,9 @@ namespace api\models\authentication;
use api\aop\annotations\CollectModelMetrics;
use api\models\base\ApiForm;
use api\traits\AccountFinder;
use api\validators\TotpValidator;
use common\helpers\Error as E;
use api\traits\AccountFinder;
use common\models\Account;
use Yii;
@@ -13,8 +13,11 @@ class LoginForm extends ApiForm {
use AccountFinder;
public $login;
public $password;
public $totp;
public $rememberMe = false;
public function rules(): array {

2
api/models/authentication/LogoutForm.php
View File

@@ -11,7 +11,7 @@ class LogoutForm extends ApiForm {
* @CollectModelMetrics(prefix="authentication.logout")
* @return bool
*/
public function logout() : bool {
public function logout(): bool {
$component = Yii::$app->user;
$session = $component->getActiveSession();
if ($session === null) {

4
api/models/authentication/RegistrationForm.php
View File

@@ -4,8 +4,8 @@ namespace api\models\authentication;
use api\aop\annotations\CollectModelMetrics;
use api\components\ReCaptcha\Validator as ReCaptchaValidator;
use api\models\base\ApiForm;
use common\helpers\Error as E;
use common\components\UserFriendlyRandomKey;
use common\helpers\Error as E;
use common\models\Account;
use common\models\confirmations\RegistrationConfirmation;
use common\models\UsernameHistory;
@@ -126,7 +126,7 @@ class RegistrationForm extends ApiForm {
*
* @return bool
*/
protected function canContinue(array $errors) : bool {
protected function canContinue(array $errors): bool {
if (ArrayHelper::getValue($errors, 'username') === E::USERNAME_NOT_AVAILABLE) {
$duplicatedUsername = Account::findOne([
'username' => $this->username,

2
api/models/authentication/RepeatAccountActivationForm.php
View File

@@ -5,8 +5,8 @@ use api\aop\annotations\CollectModelMetrics;
use api\components\ReCaptcha\Validator as ReCaptchaValidator;
use api\exceptions\ThisShouldNotHappenException;
use api\models\base\ApiForm;
use common\helpers\Error as E;
use common\components\UserFriendlyRandomKey;
use common\helpers\Error as E;
use common\models\Account;
use common\models\confirmations\RegistrationConfirmation;
use common\models\EmailActivation;

4
api/modules/accounts/actions/BaseAccountAction.php
View File

@@ -21,8 +21,6 @@ abstract class BaseAccountAction extends Action {
return $this->formatSuccessResult($model);
}
abstract protected function getFormClassName(): string;
public function getRequestData(): array {
return Yii::$app->request->post();
}
@@ -35,6 +33,8 @@ abstract class BaseAccountAction extends Action {
return [];
}
abstract protected function getFormClassName(): string;
private function formatFailedResult(AccountActionForm $model): array {
$response = [
'success' => false,

8
api/modules/accounts/actions/ChangeEmailAction.php
View File

@@ -6,10 +6,6 @@ use api\modules\accounts\models\ChangeEmailForm;
class ChangeEmailAction extends BaseAccountAction {
protected function getFormClassName(): string {
return ChangeEmailForm::class;
}
/**
* @param ChangeEmailForm|AccountActionForm $model
* @return array
@@ -20,4 +16,8 @@ class ChangeEmailAction extends BaseAccountAction {
];
}
protected function getFormClassName(): string {
return ChangeEmailForm::class;
}
}

8
api/modules/accounts/actions/EmailVerificationAction.php
View File

@@ -7,10 +7,6 @@ use common\helpers\Error as E;
class EmailVerificationAction extends BaseAccountAction {
protected function getFormClassName(): string {
return SendEmailVerificationForm::class;
}
/**
* @param SendEmailVerificationForm|AccountActionForm $model
* @return array
@@ -29,4 +25,8 @@ class EmailVerificationAction extends BaseAccountAction {
];
}
protected function getFormClassName(): string {
return SendEmailVerificationForm::class;
}
}

2
api/modules/accounts/models/ChangeEmailForm.php
View File

@@ -49,7 +49,7 @@ class ChangeEmailForm extends AccountActionForm {
}
public function createTask(int $accountId, string $newEmail, string $oldEmail): void {
$model = new EmailChanged;
$model = new EmailChanged();
$model->accountId = $accountId;
$model->oldEmail = $oldEmail;
$model->newEmail = $newEmail;

4
api/modules/accounts/models/TotpHelper.php
View File

@@ -6,6 +6,8 @@ use OTPHP\TOTP;
trait TotpHelper {
abstract public function getAccount(): Account;
protected function getTotp(): TOTP {
$account = $this->getAccount();
$totp = TOTP::create($account->otp_secret);
@@ -15,6 +17,4 @@ trait TotpHelper {
return $totp;
}
abstract public function getAccount(): Account;
}

8
api/modules/authserver/controllers/AuthenticationController.php
View File

@@ -17,10 +17,10 @@ class AuthenticationController extends Controller {
public function verbs() {
return [
'authenticate' => ['POST'],
'refresh' => ['POST'],
'validate' => ['POST'],
'signout' => ['POST'],
'invalidate' => ['POST'],
'refresh' => ['POST'],
'validate' => ['POST'],
'signout' => ['POST'],
'invalidate' => ['POST'],
];
}

4
api/modules/authserver/models/AuthenticateData.php
View File

@@ -14,11 +14,11 @@ class AuthenticateData {
$this->minecraftAccessKey = $minecraftAccessKey;
}
public function getMinecraftAccessKey() : MinecraftAccessKey {
public function getMinecraftAccessKey(): MinecraftAccessKey {
return $this->minecraftAccessKey;
}
public function getResponseData(bool $includeAvailableProfiles = false) : array {
public function getResponseData(bool $includeAvailableProfiles = false): array {
$accessKey = $this->minecraftAccessKey;
$account = $accessKey->account;

14
api/modules/authserver/models/AuthenticationForm.php
View File

@@ -14,7 +14,9 @@ use common\models\MinecraftAccessKey;
class AuthenticationForm extends ApiForm {
public $username;
public $password;
public $clientToken;
public function rules() {
@@ -41,13 +43,15 @@ class AuthenticationForm extends ApiForm {
if (isset($errors['totp'])) {
Authserver::error("User with login = '{$this->username}' protected by two factor auth.");
throw new ForbiddenOperationException('Account protected with two factor auth.');
} elseif (isset($errors['login'])) {
}
if (isset($errors['login'])) {
if ($errors['login'] === E::ACCOUNT_BANNED) {
Authserver::error("User with login = '{$this->username}' is banned");
throw new ForbiddenOperationException('This account has been suspended.');
} else {
Authserver::error("Cannot find user by login = '{$this->username}'");
}
Authserver::error("Cannot find user by login = '{$this->username}'");
} elseif (isset($errors['password'])) {
Authserver::error("User with login = '{$this->username}' passed wrong password.");
}
@@ -72,7 +76,7 @@ class AuthenticationForm extends ApiForm {
return $dataModel;
}
protected function createMinecraftAccessToken(Account $account) : MinecraftAccessKey {
protected function createMinecraftAccessToken(Account $account): MinecraftAccessKey {
/** @var MinecraftAccessKey|null $accessTokenModel */
$accessTokenModel = MinecraftAccessKey::findOne([
'account_id' => $account->id,
@@ -92,7 +96,7 @@ class AuthenticationForm extends ApiForm {
return $accessTokenModel;
}
protected function createLoginForm() : LoginForm {
protected function createLoginForm(): LoginForm {
return new LoginForm();
}

3
api/modules/authserver/models/InvalidateForm.php
View File

@@ -8,6 +8,7 @@ use common\models\MinecraftAccessKey;
class InvalidateForm extends ApiForm {
public $accessToken;
public $clientToken;
public function rules() {
@@ -20,7 +21,7 @@ class InvalidateForm extends ApiForm {
* @return bool
* @throws \api\modules\authserver\exceptions\AuthserverException
*/
public function invalidateToken() : bool {
public function invalidateToken(): bool {
$this->validate();
$token = MinecraftAccessKey::findOne([

1
api/modules/authserver/models/RefreshTokenForm.php
View File

@@ -10,6 +10,7 @@ use common\models\MinecraftAccessKey;
class RefreshTokenForm extends ApiForm {
public $accessToken;
public $clientToken;
public function rules() {

3
api/modules/authserver/models/SignoutForm.php
View File

@@ -12,6 +12,7 @@ use Yii;
class SignoutForm extends ApiForm {
public $username;
public $password;
public function rules() {
@@ -20,7 +21,7 @@ class SignoutForm extends ApiForm {
];
}
public function signout() : bool {
public function signout(): bool {
$this->validate();
$loginForm = new LoginForm();

2
api/modules/authserver/models/ValidateForm.php
View File

@@ -16,7 +16,7 @@ class ValidateForm extends ApiForm {
];
}
public function validateToken() : bool {
public function validateToken(): bool {
$this->validate();
/** @var MinecraftAccessKey|null $result */

8
api/modules/mojang/controllers/ApiController.php
View File

@@ -54,7 +54,7 @@ class ApiController extends Controller {
public function actionUsernamesByUuid($uuid) {
try {
$uuid = Uuid::fromString($uuid)->toString();
} catch(\InvalidArgumentException $e) {
} catch (\InvalidArgumentException $e) {
return $this->illegalArgumentResponse('Invalid uuid format.');
}
@@ -69,7 +69,7 @@ class ApiController extends Controller {
->all();
$data = [];
foreach($usernameHistory as $record) {
foreach ($usernameHistory as $record) {
$data[] = [
'name' => $record->username,
'changedToAt' => $record->applied_in * 1000,
@@ -94,7 +94,7 @@ class ApiController extends Controller {
return $this->illegalArgumentResponse('Not more that 100 profile name per call is allowed.');
}
foreach($usernames as $username) {
foreach ($usernames as $username) {
if (empty($username) || is_array($username)) {
return $this->illegalArgumentResponse('profileName can not be null, empty or array key.');
}
@@ -108,7 +108,7 @@ class ApiController extends Controller {
->all();
$responseData = [];
foreach($accounts as $account) {
foreach ($accounts as $account) {
$responseData[] = [
'id' => str_replace('-', '', $account->uuid),
'name' => $account->username,

2
api/modules/oauth/controllers/AuthorizationController.php
View File

@@ -38,7 +38,7 @@ class AuthorizationController extends Controller {
return [
'validate' => ['GET'],
'complete' => ['POST'],
'token' => ['POST'],
'token' => ['POST'],
];
}

1
api/modules/oauth/exceptions/OauthException.php
View File

@@ -4,4 +4,5 @@ declare(strict_types=1);
namespace api\modules\oauth\exceptions;
interface OauthException {
}

2
api/modules/oauth/models/ApplicationType.php
View File

@@ -16,7 +16,7 @@ class ApplicationType extends BaseOauthClientType {
public function rules(): array {
return ArrayHelper::merge(parent::rules(), [
['redirectUri', 'required', 'message' => E::REDIRECT_URI_REQUIRED],
['redirectUri', 'url', 'validSchemes' => ['[\w]+'], 'message' => E::REDIRECT_URI_INVALID],
['redirectUri', 'url', 'validSchemes' => ['[\w]+'], 'message' => E::REDIRECT_URI_INVALID],
['description', 'string'],
]);
}

2
api/modules/session/controllers/SessionController.php
View File

@@ -98,7 +98,7 @@ class SessionController extends Controller {
public function actionProfile($uuid) {
try {
$uuid = Uuid::fromString($uuid)->toString();
} catch(\InvalidArgumentException $e) {
} catch (\InvalidArgumentException $e) {
throw new IllegalArgumentException('Invalid uuid format.');
}

2
api/modules/session/exceptions/ForbiddenOperationException.php
View File

@@ -1,7 +1,7 @@
<?php
namespace api\modules\session\exceptions;
class ForbiddenOperationException extends SessionServerException {
class ForbiddenOperationException extends SessionServerException {
public function __construct($message, $code = 0, \Exception $previous = null) {
parent::__construct($status = 401, $message, $code, $previous);

3
api/modules/session/filters/RateLimiter.php
View File

@@ -10,6 +10,7 @@ use yii\web\TooManyRequestsHttpException;
class RateLimiter extends \yii\filters\RateLimiter {
public $limit = 180;
public $limitTime = 3600; // 1h
public $authserverDomain;
@@ -100,7 +101,7 @@ class RateLimiter extends \yii\filters\RateLimiter {
return $this->server;
}
protected function buildKey($ip) : string {
protected function buildKey($ip): string {
return 'sessionserver:ratelimit:' . $ip;
}

4
api/modules/session/models/JoinForm.php
View File

@@ -7,9 +7,9 @@ use api\modules\session\models\protocols\JoinInterface;
use api\modules\session\Module as Session;
use api\modules\session\validators\RequiredValidator;
use common\helpers\StringHelper;
use common\rbac\Permissions as P;
use common\models\Account;
use common\models\MinecraftAccessKey;
use common\rbac\Permissions as P;
use Ramsey\Uuid\Uuid;
use Yii;
use yii\base\ErrorException;
@@ -19,7 +19,9 @@ use yii\web\UnauthorizedHttpException;
class JoinForm extends Model {
public $accessToken;
public $selectedProfile;
public $serverId;
/**

2
api/modules/session/models/SessionModel.php
View File

@@ -6,7 +6,7 @@ use Yii;
class SessionModel {
const KEY_TIME = 120; // 2 min
private const KEY_TIME = 120; // 2 min
public $username;

1
api/modules/session/models/protocols/BaseHasJoined.php
View File

@@ -4,6 +4,7 @@ namespace api\modules\session\models\protocols;
abstract class BaseHasJoined implements HasJoinedInterface {
private $username;
private $serverId;
public function __construct(string $username, string $serverId) {

5
api/modules/session/models/protocols/LegacyJoin.php
View File

@@ -4,10 +4,13 @@ namespace api\modules\session\models\protocols;
class LegacyJoin extends BaseJoin {
private $user;
private $sessionId;
private $serverId;
private $accessToken;
private $uuid;
public function __construct(string $user, string $sessionId, string $serverId) {
@@ -18,7 +21,7 @@ class LegacyJoin extends BaseJoin {
$this->parseSessionId($this->sessionId);
}
public function getAccessToken() : string {
public function getAccessToken(): string {
return $this->accessToken;
}

2
api/modules/session/models/protocols/ModernJoin.php
View File

@@ -4,7 +4,9 @@ namespace api\modules\session\models\protocols;
class ModernJoin extends BaseJoin {
private $accessToken;
private $selectedProfile;
private $serverId;
public function __construct(string $accessToken, string $selectedProfile, string $serverId) {

2
api/traits/AccountFinder.php
View File

@@ -7,7 +7,7 @@ trait AccountFinder {
private $account;
public abstract function getLogin(): string;
abstract public function getLogin(): string;
public function getAccount(): ?Account {
if ($this->account === null) {

1
common/behaviors/DataBehavior.php
View File

@@ -5,6 +5,7 @@ use yii\base\Behavior;
use yii\helpers\ArrayHelper;
class DataBehavior extends Behavior {
/**
* @var string имя атрибута, к которому будет применяться поведение
*/

12
common/behaviors/EmailActivationExpirationBehavior.php
View File

@@ -30,7 +30,7 @@ class EmailActivationExpirationBehavior extends Behavior {
* @see EmailActivation::compareTime()
* @return bool
*/
public function canRepeat() : bool {
public function canRepeat(): bool {
return $this->compareTime($this->repeatTimeout);
}
@@ -44,7 +44,7 @@ class EmailActivationExpirationBehavior extends Behavior {
* @see EmailActivation::compareTime()
* @return bool
*/
public function isExpired() : bool {
public function isExpired(): bool {
return $this->compareTime($this->expirationTimeout);
}
@@ -53,7 +53,7 @@ class EmailActivationExpirationBehavior extends Behavior {
*
* @return int
*/
public function canRepeatIn() : int {
public function canRepeatIn(): int {
return $this->calculateTime($this->repeatTimeout);
}
@@ -62,11 +62,11 @@ class EmailActivationExpirationBehavior extends Behavior {
*
* @return int
*/
public function expireIn() : int {
public function expireIn(): int {
return $this->calculateTime($this->expirationTimeout);
}
protected function compareTime(int $value) : bool {
protected function compareTime(int $value): bool {
if ($value < 0) {
return false;
}
@@ -78,7 +78,7 @@ class EmailActivationExpirationBehavior extends Behavior {
return time() > $this->calculateTime($value);
}
protected function calculateTime(int $value) : int {
protected function calculateTime(int $value): int {
return $this->owner->created_at + $value;
}

8
common/behaviors/PrimaryKeyValueBehavior.php
View File

@@ -24,7 +24,7 @@ class PrimaryKeyValueBehavior extends Behavior {
];
}
public function setPrimaryKeyValue() : bool {
public function setPrimaryKeyValue(): bool {
if ($this->owner->getPrimaryKey() === null) {
$this->refreshPrimaryKeyValue();
}
@@ -40,15 +40,15 @@ class PrimaryKeyValueBehavior extends Behavior {
$this->owner->{$this->getPrimaryKeyName()} = $key;
}
protected function generateValue() : string {
protected function generateValue(): string {
return (string)call_user_func($this->value);
}
protected function isValueExists(string $key) : bool {
protected function isValueExists(string $key): bool {
return $this->owner->find()->andWhere([$this->getPrimaryKeyName() => $key])->exists();
}
protected function getPrimaryKeyName() : string {
protected function getPrimaryKeyName(): string {
$owner = $this->owner;
$primaryKeys = $owner->primaryKey();
if (!isset($primaryKeys[0])) {

2
common/components/EmailRenderer.php
View File

@@ -43,7 +43,7 @@ class EmailRenderer extends Component {
$this->renderer->setBaseDomain($this->buildBasePath());
}
public function getBaseDomain() : string {
public function getBaseDomain(): string {
return $this->_baseDomain;
}

1
common/components/Qr/ElyDecorator.php
View File

@@ -106,7 +106,6 @@ class ElyDecorator implements DecoratorInterface {
$topPadding,
$multiple
) {
}
private function encodeSvgToBase64(string $filePath): string {

80
common/components/RabbitMQ/Component.php
View File

@@ -1,11 +1,11 @@
<?php
namespace common\components\RabbitMQ;
use yii\base\Exception;
use yii\helpers\Json;
use PhpAmqpLib\Channel\AMQPChannel;
use PhpAmqpLib\Connection\AMQPStreamConnection;
use PhpAmqpLib\Message\AMQPMessage;
use yii\base\Exception;
use yii\helpers\Json;
/**
* Не гибкий компонент для работы с RabbitMQ, заточенный под нужны текущего проекта
@@ -17,20 +17,10 @@ use PhpAmqpLib\Message\AMQPMessage;
*/
class Component extends \yii\base\Component {
const TYPE_TOPIC = 'topic';
const TYPE_DIRECT = 'direct';
const TYPE_HEADERS = 'headers';
const TYPE_FANOUT = 'fanout';
/**
* @var AMQPStreamConnection
*/
protected $amqpConnection;
/**
* @var AMQPChannel[]
*/
protected $channels = [];
public const TYPE_TOPIC = 'topic';
public const TYPE_DIRECT = 'direct';
public const TYPE_HEADERS = 'headers';
public const TYPE_FANOUT = 'fanout';
/**
* @var string
@@ -57,6 +47,16 @@ class Component extends \yii\base\Component {
*/
public $vhost = '/';
/**
* @var AMQPStreamConnection
*/
protected $amqpConnection;
/**
* @var AMQPChannel[]
*/
protected $channels = [];
/**
* @inheritdoc
*/
@@ -115,6 +115,30 @@ class Component extends \yii\base\Component {
$channel->basic_publish(...$this->preparePublishArgs($message, $exchangeName, $routingKey, $publishArgs));
}
/**
* Returns prepaired AMQP message.
*
* @param string|array|object $message
* @param array $properties
* @return AMQPMessage
* @throws Exception If message is empty.
*/
public function prepareMessage($message, $properties = null) {
if ($message instanceof AMQPMessage) {
return $message;
}
if (empty($message)) {
throw new Exception('AMQP message can not be empty');
}
if (is_array($message) || is_object($message)) {
$message = Json::encode($message);
}
return new AMQPMessage($message, $properties);
}
/**
* Объединяет переданный набор аргументов с поведением по умолчанию
*
@@ -150,28 +174,4 @@ class Component extends \yii\base\Component {
], $args);
}
/**
* Returns prepaired AMQP message.
*
* @param string|array|object $message
* @param array $properties
* @return AMQPMessage
* @throws Exception If message is empty.
*/
public function prepareMessage($message, $properties = null) {
if ($message instanceof AMQPMessage) {
return $message;
}
if (empty($message)) {
throw new Exception('AMQP message can not be empty');
}
if (is_array($message) || is_object($message)) {
$message = Json::encode($message);
}
return new AMQPMessage($message, $properties);
}
}

18
common/components/Redis/Connection.php
View File

@@ -157,7 +157,7 @@ class Connection extends Component implements ConnectionInterface {
/**
* @var array List of available redis commands http://redis.io/commands
*/
const REDIS_COMMANDS = [
public const REDIS_COMMANDS = [
'BLPOP', // key [key ...] timeout Remove and get the first element in a list, or block until one is available
'BRPOP', // key [key ...] timeout Remove and get the last element in a list, or block until one is available
'BRPOPLPUSH', // source destination timeout Pop a value from a list, push it to another list and return it; or block until one is available
@@ -368,14 +368,6 @@ class Connection extends Component implements ConnectionInterface {
*/
private $_client;
public function getConnection() : ClientInterface {
if ($this->_client === null) {
$this->_client = new Client($this->prepareParams(), $this->options);
}
return $this->_client;
}
public function __call($name, $params) {
$redisCommand = mb_strtoupper($name);
if (in_array($redisCommand, self::REDIS_COMMANDS)) {
@@ -385,6 +377,14 @@ class Connection extends Component implements ConnectionInterface {
return parent::__call($name, $params);
}
public function getConnection(): ClientInterface {
if ($this->_client === null) {
$this->_client = new Client($this->prepareParams(), $this->options);
}
return $this->_client;
}
public function executeCommand(string $name, array $params = []) {
return $this->getConnection()->$name(...$params);
}

6
common/components/Redis/Key.php
View File

@@ -30,11 +30,13 @@ class Key {
public function setValue($value): self {
$this->getRedis()->set($this->key, $value);
return $this;
}
public function delete(): self {
$this->getRedis()->del([$this->getKey()]);
return $this;
}
@@ -44,17 +46,19 @@ class Key {
public function expire(int $ttl): self {
$this->getRedis()->expire($this->key, $ttl);
return $this;
}
public function expireAt(int $unixTimestamp): self {
$this->getRedis()->expireat($this->key, $unixTimestamp);
return $this;
}
private function buildKey(array $parts): string {
$keyParts = [];
foreach($parts as $part) {
foreach ($parts as $part) {
$keyParts[] = str_replace('_', ':', $part);
}

2
common/components/Redis/Set.php
View File

@@ -8,11 +8,13 @@ class Set extends Key implements IteratorAggregate {
public function add($value): self {
$this->getRedis()->sadd($this->getKey(), $value);
return $this;
}
public function remove($value): self {
$this->getRedis()->srem($this->getKey(), $value);
return $this;
}

2
common/components/SkinSystem/Api.php
View File

@@ -6,7 +6,7 @@ use Yii;
class Api {
const BASE_DOMAIN = 'http://skinsystem.ely.by';
private const BASE_DOMAIN = 'http://skinsystem.ely.by';
/**
* @param string $username

5
common/components/UserFriendlyRandomKey.php
View File

@@ -1,10 +1,11 @@
<?php
namespace common\components;
declare(strict_types=1);
namespace common\components;
class UserFriendlyRandomKey {
public static function make ($length = 18) {
public static function make(int $length = 18) {
$chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
$numChars = strlen($chars);
$key = '';

1
common/components/UserPass.php
View File

@@ -1,7 +1,6 @@
<?php
namespace common\components;
/**
* Этот класс был использован для изначальной генерации паролей на Ely.by и сейчас должен быть планомерно выпилен
* с проекта с целью заменить этот алгоритм каким-нибудь посерьёзнее.

6
common/config/ConfigLoader.php
View File

@@ -13,11 +13,11 @@ class ConfigLoader {
$this->application = $application;
}
public function getEnvironment() : string {
public function getEnvironment(): string {
return YII_ENV;
}
public function getConfig() : array {
public function getConfig(): array {
$toMerge = [
require __DIR__ . '/config.php',
];
@@ -55,7 +55,7 @@ class ConfigLoader {
return ArrayHelper::merge(...$toMerge);
}
public static function load(string $application) : array {
public static function load(string $application): array {
return (new static($application))->getConfig();
}

2
common/config/config.php
View File

@@ -115,6 +115,6 @@ return [
],
'aliases' => [
'@bower' => '@vendor/bower-asset',
'@npm' => '@vendor/npm-asset',
'@npm' => '@vendor/npm-asset',
],
];

11
common/db/mysql/QueryBuilder.php
View File

@@ -1,7 +1,7 @@
<?php
namespace common\db\mysql;
use yii\db\Expression;
use yii\db\ExpressionInterface;
use yii\db\mysql\QueryBuilder as MysqlQueryBuilder;
class QueryBuilder extends MysqlQueryBuilder {
@@ -12,22 +12,21 @@ class QueryBuilder extends MysqlQueryBuilder {
}
$orders = [];
foreach($columns as $name => $direction) {
if ($direction instanceof Expression) {
foreach ($columns as $name => $direction) {
if ($direction instanceof ExpressionInterface) {
$orders[] = $direction->expression;
} elseif (is_array($direction)) {
// This is new feature
// This condition branch is our custom solution
if (empty($direction)) {
continue;
}
$fieldValues = [];
foreach($direction as $fieldValue) {
foreach ($direction as $fieldValue) {
$fieldValues[] = $this->db->quoteValue($fieldValue);
}
$orders[] = 'FIELD(' . $this->db->quoteColumnName($name) . ',' . implode(',', $fieldValues) . ')';
// End of new feature
} else {
$orders[] = $this->db->quoteColumnName($name) . ($direction === SORT_DESC ? ' DESC' : '');
}

2
common/emails/TemplateWithRenderer.php
View File

@@ -42,7 +42,7 @@ abstract class TemplateWithRenderer extends Template {
*/
abstract public function getTemplateName(): string;
protected final function getView() {
final protected function getView() {
return $this->getTemplateName();
}

12
common/emails/templates/ChangeEmailConfirmCurrentEmail.php
View File

@@ -16,6 +16,12 @@ class ChangeEmailConfirmCurrentEmail extends Template {
return 'Ely.by Account change E-mail confirmation';
}
public function getParams(): array {
return [
'key' => $this->key,
];
}
/**
* @return string|array
*/
@@ -26,10 +32,4 @@ class ChangeEmailConfirmCurrentEmail extends Template {
];
}
public function getParams(): array {
return [
'key' => $this->key,
];
}
}

14
common/emails/templates/ChangeEmailConfirmNewEmail.php
View File

@@ -19,6 +19,13 @@ class ChangeEmailConfirmNewEmail extends Template {
return 'Ely.by Account new E-mail confirmation';
}
public function getParams(): array {
return [
'key' => $this->key,
'username' => $this->username,
];
}
/**
* @return string|array
*/
@@ -29,11 +36,4 @@ class ChangeEmailConfirmNewEmail extends Template {
];
}
public function getParams(): array {
return [
'key' => $this->key,
'username' => $this->username,
];
}
}

92
common/helpers/Error.php
View File

@@ -3,70 +3,70 @@ namespace common\helpers;
final class Error {
const USERNAME_REQUIRED = 'error.username_required';
const USERNAME_TOO_SHORT = 'error.username_too_short';
const USERNAME_TOO_LONG = 'error.username_too_long';
const USERNAME_INVALID = 'error.username_invalid';
const USERNAME_NOT_AVAILABLE = 'error.username_not_available';
public const USERNAME_REQUIRED = 'error.username_required';
public const USERNAME_TOO_SHORT = 'error.username_too_short';
public const USERNAME_TOO_LONG = 'error.username_too_long';
public const USERNAME_INVALID = 'error.username_invalid';
public const USERNAME_NOT_AVAILABLE = 'error.username_not_available';
const EMAIL_REQUIRED = 'error.email_required';
const EMAIL_TOO_LONG = 'error.email_too_long';
const EMAIL_INVALID = 'error.email_invalid';
const EMAIL_IS_TEMPMAIL = 'error.email_is_tempmail';
const EMAIL_NOT_AVAILABLE = 'error.email_not_available';
const EMAIL_NOT_FOUND = 'error.email_not_found';
public const EMAIL_REQUIRED = 'error.email_required';
public const EMAIL_TOO_LONG = 'error.email_too_long';
public const EMAIL_INVALID = 'error.email_invalid';
public const EMAIL_IS_TEMPMAIL = 'error.email_is_tempmail';
public const EMAIL_NOT_AVAILABLE = 'error.email_not_available';
public const EMAIL_NOT_FOUND = 'error.email_not_found';
const LOGIN_REQUIRED = 'error.login_required';
const LOGIN_NOT_EXIST = 'error.login_not_exist';
public const LOGIN_REQUIRED = 'error.login_required';
public const LOGIN_NOT_EXIST = 'error.login_not_exist';
const PASSWORD_REQUIRED = 'error.password_required';
const PASSWORD_INCORRECT = 'error.password_incorrect';
const PASSWORD_TOO_SHORT = 'error.password_too_short';
public const PASSWORD_REQUIRED = 'error.password_required';
public const PASSWORD_INCORRECT = 'error.password_incorrect';
public const PASSWORD_TOO_SHORT = 'error.password_too_short';
const KEY_REQUIRED = 'error.key_required';
const KEY_NOT_EXISTS = 'error.key_not_exists';
const KEY_EXPIRE = 'error.key_expire';
public const KEY_REQUIRED = 'error.key_required';
public const KEY_NOT_EXISTS = 'error.key_not_exists';
public const KEY_EXPIRE = 'error.key_expire';
const ACCOUNT_BANNED = 'error.account_banned';
const ACCOUNT_NOT_ACTIVATED = 'error.account_not_activated';
const ACCOUNT_ALREADY_ACTIVATED = 'error.account_already_activated';
const ACCOUNT_CANNOT_RESEND_MESSAGE = 'error.account_cannot_resend_message';
public const ACCOUNT_BANNED = 'error.account_banned';
public const ACCOUNT_NOT_ACTIVATED = 'error.account_not_activated';
public const ACCOUNT_ALREADY_ACTIVATED = 'error.account_already_activated';
public const ACCOUNT_CANNOT_RESEND_MESSAGE = 'error.account_cannot_resend_message';
const RECENTLY_SENT_MESSAGE = 'error.recently_sent_message';
public const RECENTLY_SENT_MESSAGE = 'error.recently_sent_message';
const NEW_PASSWORD_REQUIRED = 'error.newPassword_required';
const NEW_RE_PASSWORD_REQUIRED = 'error.newRePassword_required';
const NEW_RE_PASSWORD_DOES_NOT_MATCH = self::RE_PASSWORD_DOES_NOT_MATCH;
public const NEW_PASSWORD_REQUIRED = 'error.newPassword_required';
public const NEW_RE_PASSWORD_REQUIRED = 'error.newRePassword_required';
public const NEW_RE_PASSWORD_DOES_NOT_MATCH = self::RE_PASSWORD_DOES_NOT_MATCH;
const REFRESH_TOKEN_REQUIRED = 'error.refresh_token_required';
const REFRESH_TOKEN_NOT_EXISTS = 'error.refresh_token_not_exist';
public const REFRESH_TOKEN_REQUIRED = 'error.refresh_token_required';
public const REFRESH_TOKEN_NOT_EXISTS = 'error.refresh_token_not_exist';
const CAPTCHA_REQUIRED = 'error.captcha_required';
const CAPTCHA_INVALID = 'error.captcha_invalid';
public const CAPTCHA_REQUIRED = 'error.captcha_required';
public const CAPTCHA_INVALID = 'error.captcha_invalid';
const RULES_AGREEMENT_REQUIRED = 'error.rulesAgreement_required';
public const RULES_AGREEMENT_REQUIRED = 'error.rulesAgreement_required';
const RE_PASSWORD_REQUIRED = 'error.rePassword_required';
const RE_PASSWORD_DOES_NOT_MATCH = 'error.rePassword_does_not_match';
public const RE_PASSWORD_REQUIRED = 'error.rePassword_required';
public const RE_PASSWORD_DOES_NOT_MATCH = 'error.rePassword_does_not_match';
const UNSUPPORTED_LANGUAGE = 'error.unsupported_language';
public const UNSUPPORTED_LANGUAGE = 'error.unsupported_language';
const SUBJECT_REQUIRED = 'error.subject_required';
const MESSAGE_REQUIRED = 'error.message_required';
public const SUBJECT_REQUIRED = 'error.subject_required';
public const MESSAGE_REQUIRED = 'error.message_required';
const TOTP_REQUIRED = 'error.totp_required';
const TOTP_INCORRECT = 'error.totp_incorrect';
public const TOTP_REQUIRED = 'error.totp_required';
public const TOTP_INCORRECT = 'error.totp_incorrect';
const OTP_ALREADY_ENABLED = 'error.otp_already_enabled';
const OTP_NOT_ENABLED = 'error.otp_not_enabled';
public const OTP_ALREADY_ENABLED = 'error.otp_already_enabled';
public const OTP_NOT_ENABLED = 'error.otp_not_enabled';
const NAME_REQUIRED = 'error.name_required';
public const NAME_REQUIRED = 'error.name_required';
const REDIRECT_URI_REQUIRED = 'error.redirectUri_required';
const REDIRECT_URI_INVALID = 'error.redirectUri_invalid';
public const REDIRECT_URI_REQUIRED = 'error.redirectUri_required';
public const REDIRECT_URI_INVALID = 'error.redirectUri_invalid';
const WEBSITE_URL_INVALID = 'error.websiteUrl_invalid';
public const WEBSITE_URL_INVALID = 'error.websiteUrl_invalid';
const MINECRAFT_SERVER_IP_INVALID = 'error.minecraftServerIp_invalid';
public const MINECRAFT_SERVER_IP_INVALID = 'error.minecraftServerIp_invalid';
}

4
common/helpers/StringHelper.php
View File

@@ -13,9 +13,9 @@ class StringHelper {
if ($usernameLength === 1) {
$mask = $maskChars;
} elseif($usernameLength === 2) {
} elseif ($usernameLength === 2) {
$mask = mb_substr($username, 0, 1) . $maskChars;
} elseif($usernameLength === 3) {
} elseif ($usernameLength === 3) {
$mask = mb_substr($username, 0, 1) . $maskChars . mb_substr($username, 2, 1);
} else {
$mask = mb_substr($username, 0, 2) . $maskChars . mb_substr($username, -2, 2);

17
common/models/Account.php
View File

@@ -44,13 +44,13 @@ use const common\LATEST_RULES_VERSION;
*/
class Account extends ActiveRecord {
const STATUS_DELETED = -10;
const STATUS_BANNED = -1;
const STATUS_REGISTERED = 0;
const STATUS_ACTIVE = 10;
public const STATUS_DELETED = -10;
public const STATUS_BANNED = -1;
public const STATUS_REGISTERED = 0;
public const STATUS_ACTIVE = 10;
const PASS_HASH_STRATEGY_OLD_ELY = 0;
const PASS_HASH_STRATEGY_YII2 = 1;
public const PASS_HASH_STRATEGY_OLD_ELY = 0;
public const PASS_HASH_STRATEGY_YII2 = 1;
public static function tableName(): string {
return '{{%accounts}}';
@@ -67,10 +67,9 @@ class Account extends ActiveRecord {
$passwordHashStrategy = $this->password_hash_strategy;
}
switch($passwordHashStrategy) {
switch ($passwordHashStrategy) {
case self::PASS_HASH_STRATEGY_OLD_ELY:
$hashedPass = UserPass::make($this->email, $password);
return $hashedPass === $this->password_hash;
return UserPass::make($this->email, $password) === $this->password_hash;
case self::PASS_HASH_STRATEGY_YII2:
return Yii::$app->security->validatePassword($password, $this->password_hash);

16
common/models/EmailActivation.php
View File

@@ -28,10 +28,10 @@ use yii\helpers\ArrayHelper;
*/
class EmailActivation extends ActiveRecord {
const TYPE_REGISTRATION_EMAIL_CONFIRMATION = 0;
const TYPE_FORGOT_PASSWORD_KEY = 1;
const TYPE_CURRENT_EMAIL_CONFIRMATION = 2;
const TYPE_NEW_EMAIL_CONFIRMATION = 3;
public const TYPE_REGISTRATION_EMAIL_CONFIRMATION = 0;
public const TYPE_FORGOT_PASSWORD_KEY = 1;
public const TYPE_CURRENT_EMAIL_CONFIRMATION = 2;
public const TYPE_NEW_EMAIL_CONFIRMATION = 3;
public static function tableName() {
return '{{%email_activations}}';
@@ -79,15 +79,15 @@ class EmailActivation extends ActiveRecord {
throw new InvalidConfigException('Unexpected type');
}
return new $classMap[$type];
return new $classMap[$type]();
}
public static function getClassMap() {
return [
self::TYPE_REGISTRATION_EMAIL_CONFIRMATION => confirmations\RegistrationConfirmation::class,
self::TYPE_FORGOT_PASSWORD_KEY => confirmations\ForgotPassword::class,
self::TYPE_CURRENT_EMAIL_CONFIRMATION => confirmations\CurrentEmailConfirmation::class,
self::TYPE_NEW_EMAIL_CONFIRMATION => confirmations\NewEmailConfirmation::class,
self::TYPE_FORGOT_PASSWORD_KEY => confirmations\ForgotPassword::class,
self::TYPE_CURRENT_EMAIL_CONFIRMATION => confirmations\CurrentEmailConfirmation::class,
self::TYPE_NEW_EMAIL_CONFIRMATION => confirmations\NewEmailConfirmation::class,
];
}

2
common/models/MinecraftAccessKey.php
View File

@@ -29,7 +29,7 @@ use yii\db\ActiveRecord;
*/
class MinecraftAccessKey extends ActiveRecord {
const LIFETIME = 172800; // Ключ актуален в течение 2 дней
public const LIFETIME = 172800; // Ключ актуален в течение 2 дней
public static function tableName(): string {
return '{{%minecraft_access_keys}}';

8
common/models/OauthScopeQuery.php
View File

@@ -11,6 +11,10 @@ class OauthScopeQuery {
private $owner;
public function __construct(array $scopes) {
$this->scopes = $scopes;
}
public function onlyPublic(): self {
$this->internal = false;
return $this;
@@ -43,8 +47,4 @@ class OauthScopeQuery {
}), 'value');
}
public function __construct(array $scopes) {
$this->scopes = $scopes;
}
}

6
common/models/Textures.php
View File

@@ -21,7 +21,7 @@ class Textures {
}
public function getMinecraftResponse() {
$response = [
$response = [
'name' => $this->account->username,
'id' => str_replace('-', '', $this->account->uuid),
'properties' => [
@@ -54,9 +54,9 @@ class Textures {
if (!$encrypted) {
return $array;
} else {
return static::encrypt($array);
}
return static::encrypt($array);
}
public function getTextures(): array {

2
common/models/UsernameHistory.php
View File

@@ -45,7 +45,7 @@ class UsernameHistory extends ActiveRecord {
* @param int $afterTime
* @return UsernameHistory|null
*/
public function findNext(int $afterTime = null) /*: ?UsernameHistory*/ {
public function findNext(int $afterTime = null): ?UsernameHistory {
return self::find()
->andWhere(['account_id' => $this->account_id])
->andWhere(['>', 'applied_in', $afterTime ?: $this->applied_in])

2
common/models/confirmations/NewEmailConfirmation.php
View File

@@ -13,7 +13,7 @@ class NewEmailConfirmation extends EmailActivation {
public function behaviors() {
return ArrayHelper::merge(parent::behaviors(), [
'expirationBehavior' => [
'repeatTimeout' => 5 * 60,
'repeatTimeout' => 5 * 60,
],
'dataBehavior' => [
'class' => NewEmailConfirmationBehavior::class,

4
common/models/confirmations/NewEmailConfirmationBehavior.php
View File

@@ -8,11 +8,11 @@ use common\behaviors\DataBehavior;
*/
class NewEmailConfirmationBehavior extends DataBehavior {
public function getNewEmail() : string {
public function getNewEmail(): string {
return $this->getKey('newEmail');
}
public function setNewEmail(string $newEmail) {
public function setNewEmail(string $newEmail): void {
$this->setKey('newEmail', $newEmail);
}

4
composer.json
View File

@@ -38,7 +38,9 @@
"codeception/specify": "^1.0.0",
"codeception/verify": "*",
"mockery/mockery": "^1.0.0",
"php-mock/php-mock-mockery": "^1.2.0"
"php-mock/php-mock-mockery": "^1.2.0",
"friendsofphp/php-cs-fixer": "^2.11",
"ely/php-code-style": "^0.1.0"
},
"repositories": [
{

465
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"content-hash": "b322fafe1486ee057b633a35d336c1a1",
"content-hash": "63497214afa6b50f50d3bc80fe9eb269",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -3165,6 +3165,68 @@
"description": "BDD assertion library for PHPUnit",
"time": "2017-11-12T01:51:59+00:00"
},
{
"name": "composer/semver",
"version": "1.4.2",
"source": {
"type": "git",
"url": "https://github.com/composer/semver.git",
"reference": "c7cb9a2095a074d131b65a8a0cd294479d785573"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/semver/zipball/c7cb9a2095a074d131b65a8a0cd294479d785573",
"reference": "c7cb9a2095a074d131b65a8a0cd294479d785573",
"shasum": ""
},
"require": {
"php": "^5.3.2 || ^7.0"
},
"require-dev": {
"phpunit/phpunit": "^4.5 || ^5.0.5",
"phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"autoload": {
"psr-4": {
"Composer\\Semver\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nils Adermann",
"email": "naderman@naderman.de",
"homepage": "http://www.naderman.de"
},
{
"name": "Jordi Boggiano",
"email": "j.boggiano@seld.be",
"homepage": "http://seld.be"
},
{
"name": "Rob Bast",
"email": "rob.bast@gmail.com",
"homepage": "http://robbast.nl"
}
],
"description": "Semver library that offers utilities, version constraint parsing and validation.",
"keywords": [
"semantic",
"semver",
"validation",
"versioning"
],
"time": "2016-08-30T16:08:34+00:00"
},
{
"name": "doctrine/instantiator",
"version": "1.1.0",
@@ -3219,6 +3281,55 @@
],
"time": "2017-07-22T11:58:36+00:00"
},
{
"name": "ely/php-code-style",
"version": "0.1.0",
"source": {
"type": "git",
"url": "https://github.com/elyby/php-code-style.git",
"reference": "0bb3e8082753981af4775f5b95d159c9cd9c6bf4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/elyby/php-code-style/zipball/0bb3e8082753981af4775f5b95d159c9cd9c6bf4",
"reference": "0bb3e8082753981af4775f5b95d159c9cd9c6bf4",
"shasum": ""
},
"require": {
"friendsofphp/php-cs-fixer": "^2.11",
"php": "^7.0"
},
"require-dev": {
"phpunit/phpunit": "^7.0"
},
"type": "library",
"autoload": {
"psr-4": {
"Ely\\CS\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"Apache-2.0"
],
"authors": [
{
"name": "Ely.by team",
"email": "team@ely.by"
},
{
"name": "ErickSkrauch",
"email": "erickskrauch@ely.by"
}
],
"description": "Set of PHP-CS-Fixer rules used in the development of Ely.by PHP projects",
"homepage": "https://github.com/elyby/php-code-style",
"keywords": [
"Code style",
"php-cs-fixer"
],
"time": "2018-04-17T18:28:51+00:00"
},
{
"name": "facebook/webdriver",
"version": "1.5.0",
@@ -3315,6 +3426,100 @@
"description": "JSONPath implementation for parsing, searching and flattening arrays",
"time": "2016-09-06T17:43:18+00:00"
},
{
"name": "friendsofphp/php-cs-fixer",
"version": "v2.11.1",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
"reference": "ad94441c17b8ef096e517acccdbf3238af8a2da8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/ad94441c17b8ef096e517acccdbf3238af8a2da8",
"reference": "ad94441c17b8ef096e517acccdbf3238af8a2da8",
"shasum": ""
},
"require": {
"composer/semver": "^1.4",
"doctrine/annotations": "^1.2",
"ext-json": "*",
"ext-tokenizer": "*",
"php": "^5.6 || >=7.0 <7.3",
"php-cs-fixer/diff": "^1.3",
"symfony/console": "^3.2 || ^4.0",
"symfony/event-dispatcher": "^3.0 || ^4.0",
"symfony/filesystem": "^3.0 || ^4.0",
"symfony/finder": "^3.0 || ^4.0",
"symfony/options-resolver": "^3.0 || ^4.0",
"symfony/polyfill-php70": "^1.0",
"symfony/polyfill-php72": "^1.4",
"symfony/process": "^3.0 || ^4.0",
"symfony/stopwatch": "^3.0 || ^4.0"
},
"conflict": {
"hhvm": "*"
},
"require-dev": {
"johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
"justinrainbow/json-schema": "^5.0",
"keradus/cli-executor": "^1.0",
"mikey179/vfsstream": "^1.6",
"php-coveralls/php-coveralls": "^2.0",
"php-cs-fixer/accessible-object": "^1.0",
"phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0",
"phpunitgoodpractices/traits": "^1.3.1",
"symfony/phpunit-bridge": "^3.2.2 || ^4.0"
},
"suggest": {
"ext-mbstring": "For handling non-UTF8 characters in cache signature.",
"symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
},
"bin": [
"php-cs-fixer"
],
"type": "application",
"extra": {
"branch-alias": {
"dev-master": "2.11-dev"
}
},
"autoload": {
"psr-4": {
"PhpCsFixer\\": "src/"
},
"classmap": [
"tests/Test/AbstractFixerTestCase.php",
"tests/Test/AbstractIntegrationCaseFactory.php",
"tests/Test/AbstractIntegrationTestCase.php",
"tests/Test/Assert/AssertTokensTrait.php",
"tests/Test/Constraint/SameStringsConstraint.php",
"tests/Test/Constraint/SameStringsConstraintForV5.php",
"tests/Test/Constraint/SameStringsConstraintForV7.php",
"tests/Test/IntegrationCase.php",
"tests/Test/IntegrationCaseFactory.php",
"tests/Test/IntegrationCaseFactoryInterface.php",
"tests/Test/InternalIntegrationCaseFactory.php",
"tests/TestCase.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Dariusz Rumiński",
"email": "dariusz.ruminski@gmail.com"
},
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
}
],
"description": "A tool to automatically fix PHP code style",
"time": "2018-03-21T17:41:26+00:00"
},
{
"name": "fzaninotto/faker",
"version": "v1.7.1",
@@ -3625,6 +3830,57 @@
"description": "Library for handling version information and constraints",
"time": "2017-03-05T17:38:23+00:00"
},
{
"name": "php-cs-fixer/diff",
"version": "v1.3.0",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/diff.git",
"reference": "78bb099e9c16361126c86ce82ec4405ebab8e756"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/78bb099e9c16361126c86ce82ec4405ebab8e756",
"reference": "78bb099e9c16361126c86ce82ec4405ebab8e756",
"shasum": ""
},
"require": {
"php": "^5.6 || ^7.0"
},
"require-dev": {
"phpunit/phpunit": "^5.7.23 || ^6.4.3",
"symfony/process": "^3.3"
},
"type": "library",
"autoload": {
"classmap": [
"src/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause"
],
"authors": [
{
"name": "Kore Nordmann",
"email": "mail@kore-nordmann.de"
},
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de"
},
{
"name": "SpacePossum"
}
],
"description": "sebastian/diff v2 backport support for PHP5.6",
"homepage": "https://github.com/PHP-CS-Fixer",
"keywords": [
"diff"
],
"time": "2018-02-15T16:58:55+00:00"
},
{
"name": "php-mock/php-mock",
"version": "1.0.1",
@@ -5257,6 +5513,55 @@
"homepage": "https://symfony.com",
"time": "2018-01-03T07:38:00+00:00"
},
{
"name": "symfony/filesystem",
"version": "v4.0.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21",
"reference": "5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21",
"shasum": ""
},
"require": {
"php": "^7.1.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\Filesystem\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
"time": "2018-02-22T10:50:29+00:00"
},
{
"name": "symfony/finder",
"version": "v4.0.4",
@@ -5306,6 +5611,164 @@
"homepage": "https://symfony.com",
"time": "2018-01-03T07:38:00+00:00"
},
{
"name": "symfony/options-resolver",
"version": "v4.0.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
"reference": "371532a2cfe932f7a3766dd4c45364566def1dd0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/371532a2cfe932f7a3766dd4c45364566def1dd0",
"reference": "371532a2cfe932f7a3766dd4c45364566def1dd0",
"shasum": ""
},
"require": {
"php": "^7.1.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\OptionsResolver\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony OptionsResolver Component",
"homepage": "https://symfony.com",
"keywords": [
"config",
"configuration",
"options"
],
"time": "2018-01-18T22:19:33+00:00"
},
{
"name": "symfony/polyfill-php72",
"version": "v1.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
"reference": "8eca20c8a369e069d4f4c2ac9895144112867422"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/8eca20c8a369e069d4f4c2ac9895144112867422",
"reference": "8eca20c8a369e069d4f4c2ac9895144112867422",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.7-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Polyfill\\Php72\\": ""
},
"files": [
"bootstrap.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"polyfill",
"portable",
"shim"
],
"time": "2018-01-31T17:43:24+00:00"
},
{
"name": "symfony/stopwatch",
"version": "v4.0.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
"reference": "6795ffa2f8eebedac77f045aa62c0c10b2763042"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/stopwatch/zipball/6795ffa2f8eebedac77f045aa62c0c10b2763042",
"reference": "6795ffa2f8eebedac77f045aa62c0c10b2763042",
"shasum": ""
},
"require": {
"php": "^7.1.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\Stopwatch\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Stopwatch Component",
"homepage": "https://symfony.com",
"time": "2018-02-19T16:50:22+00:00"
},
{
"name": "symfony/yaml",
"version": "v4.0.4",

2
console/controllers/AmqpController.php
View File

@@ -17,7 +17,7 @@ abstract class AmqpController extends Controller {
private $reconnected = false;
public final function actionIndex() {
final public function actionIndex() {
$this->start();
}

2
console/controllers/CleanupController.php
View File

@@ -85,7 +85,7 @@ class CleanupController extends Controller {
$durationsMap = [];
foreach (EmailActivation::getClassMap() as $typeId => $className) {
/** @var EmailActivation $object */
$object = new $className;
$object = new $className();
/** @var \common\behaviors\EmailActivationExpirationBehavior $behavior */
$behavior = $object->getBehavior('expirationBehavior');
/** @noinspection NullPointerExceptionInspection */

2
console/controllers/RbacController.php
View File

@@ -95,7 +95,7 @@ class RbacController extends Controller {
$authManager = $this->getAuthManager();
$permission = $authManager->createPermission($name);
if ($ruleClassName !== null) {
$rule = new $ruleClassName;
$rule = new $ruleClassName();
if (!$rule instanceof Rule) {
throw new InvalidArgumentException('ruleClassName must be rule class name');
}

2
console/db/Migration.php
View File

@@ -43,7 +43,7 @@ class Migration extends YiiMigration {
private function buildKey(array $columns) {
$key = '';
foreach ($columns as $i => $column) {
$key .= $i == count($columns) ? $column : "$column,";
$key .= $i === count($columns) ? $column : "$column,";
}
return $key;

26
console/migrations/m160201_055928_oauth.php
View File

@@ -6,14 +6,14 @@ class m160201_055928_oauth extends Migration {
public function safeUp() {
$this->createTable('{{%oauth_clients}}', [
'id' => $this->string(64),
'secret' => $this->string()->notNull(),
'name' => $this->string()->notNull(),
'description' => $this->string(),
'id' => $this->string(64),
'secret' => $this->string()->notNull(),
'name' => $this->string()->notNull(),
'description' => $this->string(),
'redirect_uri' => $this->string()->notNull(),
'account_id' => $this->getDb()->getTableSchema('{{%accounts}}')->getColumn('id')->dbType,
'is_trusted' => $this->boolean()->defaultValue(false)->notNull(),
'created_at' => $this->integer()->notNull(),
'account_id' => $this->getDb()->getTableSchema('{{%accounts}}')->getColumn('id')->dbType,
'is_trusted' => $this->boolean()->defaultValue(false)->notNull(),
'created_at' => $this->integer()->notNull(),
$this->primary('id'),
], $this->tableOptions);
@@ -23,17 +23,17 @@ class m160201_055928_oauth extends Migration {
], $this->tableOptions);
$this->createTable('{{%oauth_sessions}}', [
'id' => $this->primaryKey(),
'owner_type' => $this->string()->notNull(),
'owner_id' => $this->string()->notNull(),
'client_id' => $this->getDb()->getTableSchema('{{%oauth_clients}}')->getColumn('id')->dbType,
'id' => $this->primaryKey(),
'owner_type' => $this->string()->notNull(),
'owner_id' => $this->string()->notNull(),
'client_id' => $this->getDb()->getTableSchema('{{%oauth_clients}}')->getColumn('id')->dbType,
'client_redirect_uri' => $this->string(),
], $this->tableOptions);
$this->createTable('{{%oauth_access_tokens}}', [
'access_token' => $this->string(64),
'session_id' => $this->getDb()->getTableSchema('{{%oauth_sessions}}')->getColumn('id')->dbType,
'expire_time' => $this->integer()->notNull(),
'session_id' => $this->getDb()->getTableSchema('{{%oauth_sessions}}')->getColumn('id')->dbType,
'expire_time' => $this->integer()->notNull(),
$this->primary('access_token'),
], $this->tableOptions);

2
console/migrations/m160414_231110_account_nicknames_history.php
View File

@@ -21,7 +21,7 @@ class m160414_231110_account_nicknames_history extends Migration {
FROM {{%accounts}}
')->queryAll();
foreach($accountNicknames as $row) {
foreach ($accountNicknames as $row) {
$this->insert('{{%usernames_history}}', [
'username' => $row['username'],
'account_id' => $row['id'],

6
console/migrations/m160819_211139_minecraft_access_tokens.php
View File

@@ -8,9 +8,9 @@ class m160819_211139_minecraft_access_tokens extends Migration {
$this->createTable('{{%minecraft_access_keys}}', [
'access_token' => $this->string(36)->notNull(),
'client_token' => $this->string(36)->notNull(),
'account_id' => $this->db->getTableSchema('{{%accounts}}')->getColumn('id')->dbType . ' NOT NULL',
'created_at' => $this->integer()->unsigned()->notNull(),
'updated_at' => $this->integer()->unsigned()->notNull(),
'account_id' => $this->db->getTableSchema('{{%accounts}}')->getColumn('id')->dbType . ' NOT NULL',
'created_at' => $this->integer()->unsigned()->notNull(),
'updated_at' => $this->integer()->unsigned()->notNull(),
]);
$this->addPrimaryKey('access_token', '{{%minecraft_access_keys}}', 'access_token');

8
console/migrations/m161030_013122_ely_by_admin_app.php
View File

@@ -4,8 +4,6 @@ use console\db\Migration;
class m161030_013122_ely_by_admin_app extends Migration {
const APP_NAME = 'ely_admin';
public function safeUp() {
$exists = $this->db->createCommand('
SELECT COUNT(*)
@@ -13,12 +11,12 @@ class m161030_013122_ely_by_admin_app extends Migration {
WHERE id = :app_name
LIMIT 1
', [
'app_name' => self::APP_NAME,
'app_name' => 'ely_admin',
])->queryScalar();
if (!$exists) {
$this->insert('{{%oauth_clients}}', [
'id' => self::APP_NAME,
'id' => 'ely_admin',
'secret' => 'change_this_on_production',
'name' => 'Admin Ely.by',
'description' => '',
@@ -30,7 +28,7 @@ class m161030_013122_ely_by_admin_app extends Migration {
}
public function safeDown() {
$this->delete('{{%oauth_clients}}', ['id' => self::APP_NAME]);
$this->delete('{{%oauth_clients}}', ['id' => 'ely_admin']);
}
}

4
console/migrations/m161222_222520_remove_oauth_access_tokens.php
View File

@@ -12,8 +12,8 @@ class m161222_222520_remove_oauth_access_tokens extends Migration {
public function safeDown() {
$this->createTable('{{%oauth_access_tokens}}', [
'access_token' => $this->string(64),
'session_id' => $this->getDb()->getTableSchema('{{%oauth_sessions}}')->getColumn('id')->dbType,
'expire_time' => $this->integer()->notNull(),
'session_id' => $this->getDb()->getTableSchema('{{%oauth_sessions}}')->getColumn('id')->dbType,
'expire_time' => $this->integer()->notNull(),
$this->primary('access_token'),
], $this->tableOptions);

4
tests/codeception/api/_bootstrap.php
View File

@@ -17,7 +17,7 @@ require_once __DIR__ . '/../../../api/config/bootstrap.php';
// the entry script file path for functional tests
$_SERVER['SCRIPT_FILENAME'] = API_ENTRY_FILE;
$_SERVER['SCRIPT_NAME'] = API_ENTRY_URL;
$_SERVER['SERVER_NAME'] = parse_url(Configuration::config()['config']['test_entry_url'], PHP_URL_HOST);
$_SERVER['SERVER_PORT'] = parse_url(Configuration::config()['config']['test_entry_url'], PHP_URL_PORT) ?: '80';
$_SERVER['SERVER_NAME'] = parse_url(Configuration::config()['config']['test_entry_url'], PHP_URL_HOST);
$_SERVER['SERVER_PORT'] = parse_url(Configuration::config()['config']['test_entry_url'], PHP_URL_PORT) ?: '80';
Yii::setAlias('@tests', dirname(__DIR__, 2));

10
tests/codeception/api/_support/UnitTester.php
View File

@@ -16,11 +16,11 @@ namespace tests\codeception\api;
*
* @SuppressWarnings(PHPMD)
*/
class UnitTester extends \Codeception\Actor
{
class UnitTester extends \Codeception\Actor {
use _generated\UnitTesterActions;
/**
* Define custom actions here
*/
/**
* Define custom actions here
*/
}

2
tests/codeception/api/functional/_steps/SessionServerSteps.php
View File

@@ -35,7 +35,7 @@ class SessionServerSteps extends FunctionalTester {
return [$username, $serverId];
}
public function canSeeValidTexturesResponse($expectedUsername, $expectedUuid) {
$this->seeResponseIsJson();
$this->canSeeResponseContainsJson([

2
tests/codeception/api/functional/authserver/AuthorizationCest.php
View File

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

3
tests/codeception/api/functional/mojang/UsernamesToUuidsCest.php
View File

@@ -64,9 +64,10 @@ class UsernamesToUuidsCest {
public function passTooManyUsernames(FunctionalTester $I) {
$I->wantTo('get specific response when pass too many usernames');
$usernames = [];
for($i = 0; $i < 150; $i++) {
for ($i = 0; $i < 150; $i++) {
$usernames[] = random_bytes(10);
}
$this->route->uuidsByUsernames($usernames);
$I->canSeeResponseCodeIs(400);
$I->canSeeResponseIsJson();

12
tests/codeception/api/unit/TestCase.php
View File

@@ -3,13 +3,18 @@ namespace tests\codeception\api\unit;
use Mockery;
class TestCase extends \Codeception\Test\Unit {
class TestCase extends \Codeception\Test\Unit {
/**
* @var \tests\codeception\api\UnitTester
*/
protected $tester;
protected function tearDown() {
parent::tearDown();
Mockery::close();
}
/**
* Список фикстур, что будут загружены перед тестом, но после зачистки базы данных
*
@@ -21,9 +26,4 @@ class TestCase extends \Codeception\Test\Unit {
return [];
}
protected function tearDown() {
parent::tearDown();
Mockery::close();
}
}

2
tests/codeception/api/unit/components/User/ComponentTest.php
View File

@@ -1,9 +1,9 @@
<?php
namespace codeception\api\unit\components\User;
use api\components\User\AuthenticationResult;
use api\components\User\Component;
use api\components\User\Identity;
use api\components\User\AuthenticationResult;
use common\models\Account;
use common\models\AccountSession;
use Emarref\Jwt\Claim;

14
tests/codeception/api/unit/models/authentication/LoginFormTest.php
View File

@@ -32,7 +32,7 @@ class LoginFormTest extends TestCase {
}
public function testValidateLogin() {
$this->specify('error.login_not_exist if login not exists', function () {
$this->specify('error.login_not_exist if login not exists', function() {
$model = $this->createModel([
'login' => 'mr-test',
'account' => null,
@@ -41,7 +41,7 @@ class LoginFormTest extends TestCase {
$this->assertEquals(['error.login_not_exist'], $model->getErrors('login'));
});
$this->specify('no errors if login exists', function () {
$this->specify('no errors if login exists', function() {
$model = $this->createModel([
'login' => 'mr-test',
'account' => new Account(),
@@ -52,7 +52,7 @@ class LoginFormTest extends TestCase {
}
public function testValidatePassword() {
$this->specify('error.password_incorrect if password invalid', function () {
$this->specify('error.password_incorrect if password invalid', function() {
$model = $this->createModel([
'password' => '87654321',
'account' => new Account(['password' => '12345678']),
@@ -61,7 +61,7 @@ class LoginFormTest extends TestCase {
$this->assertEquals(['error.password_incorrect'], $model->getErrors('password'));
});
$this->specify('no errors if password valid', function () {
$this->specify('no errors if password valid', function() {
$model = $this->createModel([
'password' => '12345678',
'account' => new Account(['password' => '12345678']),
@@ -100,7 +100,7 @@ class LoginFormTest extends TestCase {
}
public function testValidateActivity() {
$this->specify('error.account_not_activated if account in not activated state', function () {
$this->specify('error.account_not_activated if account in not activated state', function() {
$model = $this->createModel([
'account' => new Account(['status' => Account::STATUS_REGISTERED]),
]);
@@ -108,7 +108,7 @@ class LoginFormTest extends TestCase {
$this->assertEquals(['error.account_not_activated'], $model->getErrors('login'));
});
$this->specify('error.account_banned if account has banned status', function () {
$this->specify('error.account_banned if account has banned status', function() {
$model = $this->createModel([
'account' => new Account(['status' => Account::STATUS_BANNED]),
]);
@@ -116,7 +116,7 @@ class LoginFormTest extends TestCase {
$this->assertEquals(['error.account_banned'], $model->getErrors('login'));
});
$this->specify('no errors if account active', function () {
$this->specify('no errors if account active', function() {
$model = $this->createModel([
'account' => new Account(['status' => Account::STATUS_ACTIVE]),
]);

4
tests/codeception/api/unit/models/authentication/LogoutFormTest.php
View File

@@ -13,7 +13,7 @@ class LogoutFormTest extends TestCase {
use Specify;
public function testValidateLogout() {
$this->specify('No actions if active session is not exists', function () {
$this->specify('No actions if active session is not exists', function() {
$userComp = $this
->getMockBuilder(Component::class)
->setConstructorArgs([$this->getComponentArgs()])
@@ -30,7 +30,7 @@ class LogoutFormTest extends TestCase {
expect($model->logout())->true();
});
$this->specify('if active session is presented, then delete should be called', function () {
$this->specify('if active session is presented, then delete should be called', function() {
$session = $this
->getMockBuilder(AccountSession::class)
->setMethods(['delete'])

2
tests/codeception/api/unit/modules/internal/models/BanFormTest.php
View File

@@ -1,8 +1,8 @@
<?php
namespace tests\codeception\api\unit\modules\internal\models;
use api\modules\internal\helpers\Error as E;
use api\modules\accounts\models\BanAccountForm;
use api\modules\internal\helpers\Error as E;
use common\models\Account;
use tests\codeception\api\unit\TestCase;

2
tests/codeception/api/unit/modules/internal/models/PardonFormTest.php
View File

@@ -1,8 +1,8 @@
<?php
namespace tests\codeception\api\unit\modules\internal\models;
use api\modules\internal\helpers\Error as E;
use api\modules\accounts\models\PardonAccountForm;
use api\modules\internal\helpers\Error as E;
use common\models\Account;
use tests\codeception\api\unit\TestCase;

2
tests/codeception/api/unit/modules/oauth/models/OauthClientFormTest.php
View File

@@ -55,7 +55,6 @@ class OauthClientFormTest extends TestCase {
$form->shouldReceive('isClientExists')->andReturn(false);
$request = new class implements OauthClientTypeForm {
public function load($data): bool {
return true;
}
@@ -72,7 +71,6 @@ class OauthClientFormTest extends TestCase {
$client->name = 'New name';
$client->description = 'New description.';
}
};
$this->assertTrue($form->save($request));

Some files were not shown because too many files have changed in this diff Show More