From e15ff3f9d145dd39e2562b88255be1a3bfdb844d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=B5nis=20Ormisson?= <tonis@andmemasin.eu>
Date: Wed, 12 Sep 2018 19:15:29 +0300
Subject: [PATCH] DEV: use ModuleAwareTrait instead

---
 src/User/Controller/AdminController.php        | 6 +++---
 src/User/Controller/RecoveryController.php     | 4 ++--
 src/User/Controller/RegistrationController.php | 4 ++--
 src/User/Controller/SecurityController.php     | 4 ++--
 src/User/Controller/SettingsController.php     | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/User/Controller/AdminController.php b/src/User/Controller/AdminController.php
index 8a7ec8b..660e74f 100644
--- a/src/User/Controller/AdminController.php
+++ b/src/User/Controller/AdminController.php
@@ -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']);
diff --git a/src/User/Controller/RecoveryController.php b/src/User/Controller/RecoveryController.php
index 4a0a6f5..045d513 100644
--- a/src/User/Controller/RecoveryController.php
+++ b/src/User/Controller/RecoveryController.php
@@ -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.
diff --git a/src/User/Controller/RegistrationController.php b/src/User/Controller/RegistrationController.php
index 5a715c9..20ee421 100644
--- a/src/User/Controller/RegistrationController.php
+++ b/src/User/Controller/RegistrationController.php
@@ -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.
diff --git a/src/User/Controller/SecurityController.php b/src/User/Controller/SecurityController.php
index d4713ab..5e1a36a 100644
--- a/src/User/Controller/SecurityController.php
+++ b/src/User/Controller/SecurityController.php
@@ -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.
diff --git a/src/User/Controller/SettingsController.php b/src/User/Controller/SettingsController.php
index 2774e24..440d655 100644
--- a/src/User/Controller/SettingsController.php
+++ b/src/User/Controller/SettingsController.php
@@ -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.