leonardo/yii2-usuario
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DEV: use ModuleAwareTrait instead

Browse Source
This commit is contained in:
Tõnis Ormisson
2018-09-12 19:15:29 +03:00
parent 841b03d52e
commit e15ff3f9d1
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/User/Controller/AdminController.php
View File

@ -25,6 +25,7 @@ use Da\User\Service\UserBlockService;
use Da\User\Service\UserConfirmationService;
use Da\User\Service\UserCreateService;
use Da\User\Traits\ContainerAwareTrait;
use Da\User\Traits\ModuleAwareTrait;
use Da\User\Validator\AjaxRequestModelValidator;
use Yii;
use yii\base\Module;
@ -37,6 +38,7 @@ use yii\web\Controller;
class AdminController extends Controller
{
use ContainerAwareTrait;
use ModuleAwareTrait;
/**
* @var UserQuery
@ -300,9 +302,7 @@ class AdminController extends Controller
public function actionSwitchIdentity($id = null)
{
/** @var \Da\User\Module $module */
$module = $this->module;
if (false === $module->enableSwitchIdentities) {
if (false === $this->module->enableSwitchIdentities) {
Yii::$app->getSession()->setFlash('danger', Yii::t('usuario', 'Switch identities is disabled.'));
return $this->redirect(['index']);

4
src/User/Controller/RecoveryController.php
View File

@ -22,6 +22,7 @@ use Da\User\Query\UserQuery;
use Da\User\Service\PasswordRecoveryService;
use Da\User\Service\ResetPasswordService;
use Da\User\Traits\ContainerAwareTrait;
use Da\User\Traits\ModuleAwareTrait;
use Da\User\Validator\AjaxRequestModelValidator;
use Yii;
use yii\base\InvalidConfigException;
@ -33,12 +34,11 @@ use yii\web\NotFoundHttpException;
class RecoveryController extends Controller
{
use ContainerAwareTrait;
use ModuleAwareTrait;
protected $userQuery;
protected $tokenQuery;
/** @var \Da\User\Module */
public $module;
/**
* RecoveryController constructor.

4
src/User/Controller/RegistrationController.php
View File

@ -27,6 +27,7 @@ use Da\User\Service\UserConfirmationService;
use Da\User\Service\UserCreateService;
use Da\User\Service\UserRegisterService;
use Da\User\Traits\ContainerAwareTrait;
use Da\User\Traits\ModuleAwareTrait;
use Da\User\Validator\AjaxRequestModelValidator;
use Yii;
use yii\base\Module;
@ -37,12 +38,11 @@ use yii\web\NotFoundHttpException;
class RegistrationController extends Controller
{
use ContainerAwareTrait;
use ModuleAwareTrait;
protected $userQuery;
protected $socialNetworkAccountQuery;
/** @var \Da\User\Module */
public $module;
/**
* RegistrationController constructor.

4
src/User/Controller/SecurityController.php
View File

@ -19,6 +19,7 @@ use Da\User\Query\SocialNetworkAccountQuery;
use Da\User\Service\SocialNetworkAccountConnectService;
use Da\User\Service\SocialNetworkAuthenticateService;
use Da\User\Traits\ContainerAwareTrait;
use Da\User\Traits\ModuleAwareTrait;
use Yii;
use yii\authclient\AuthAction;
use yii\base\InvalidConfigException;
@ -33,11 +34,10 @@ use yii\widgets\ActiveForm;
class SecurityController extends Controller
{
use ContainerAwareTrait;
use ModuleAwareTrait;
protected $socialNetworkAccountQuery;
/** @var \Da\User\Module */
public $module;
/**
* SecurityController constructor.

4
src/User/Controller/SettingsController.php
View File

@ -30,6 +30,7 @@ use Da\User\Query\UserQuery;
use Da\User\Service\EmailChangeService;
use Da\User\Service\TwoFactorQrCodeUriGeneratorService;
use Da\User\Traits\ContainerAwareTrait;
use Da\User\Traits\ModuleAwareTrait;
use Da\User\Validator\AjaxRequestModelValidator;
use Da\User\Validator\TwoFactorCodeValidator;
use Yii;
@ -44,6 +45,7 @@ use yii\web\Response;
class SettingsController extends Controller
{
use ContainerAwareTrait;
use ModuleAwareTrait;
/**
* {@inheritdoc}
@ -54,8 +56,6 @@ class SettingsController extends Controller
protected $userQuery;
protected $socialNetworkAccountQuery;
/** @var \Da\User\Module */
public $module;
/**
* SettingsController constructor.