ContainerTrait -> ContainerAwareTrait

lib/User/Command/ConfirmController.php

@@ -13,7 +13,7 @@ namespace Da\User\Command;
 
 use Da\User\Query\UserQuery;
 use Da\User\Service\UserConfirmationService;
-use Da\User\Traits\ContainerTrait;
+use Da\User\Traits\ContainerAwareTrait;
 use Yii;
 use yii\base\Module;
 use yii\console\Controller;
@@ -21,7 +21,7 @@ use yii\helpers\Console;
 
 class ConfirmController extends Controller
 {
-    use ContainerTrait;
+    use ContainerAwareTrait;
 
     protected $userQuery;
 

lib/User/Command/CreateController.php

@@ -14,14 +14,14 @@ namespace Da\User\Command;
 use Da\User\Factory\MailFactory;
 use Da\User\Model\User;
 use Da\User\Service\UserCreateService;
-use Da\User\Traits\ContainerTrait;
+use Da\User\Traits\ContainerAwareTrait;
 use Yii;
 use yii\console\Controller;
 use yii\helpers\Console;
 
 class CreateController extends Controller
 {
-    use ContainerTrait;
+    use ContainerAwareTrait;
 
     public function actionIndex($email, $username, $password = null)
     {

lib/User/Command/PasswordController.php

@@ -14,7 +14,7 @@ namespace Da\User\Command;
 use Da\User\Model\User;
 use Da\User\Query\UserQuery;
 use Da\User\Service\ResetPasswordService;
-use Da\User\Traits\ContainerTrait;
+use Da\User\Traits\ContainerAwareTrait;
 use Yii;
 use yii\base\Module;
 use yii\console\Controller;
@@ -22,7 +22,7 @@ use yii\helpers\Console;
 
 class PasswordController extends Controller
 {
-    use ContainerTrait;
+    use ContainerAwareTrait;
 
     protected $userQuery;
 

lib/User/Controller/AbstractAuthItemController.php

@@ -16,7 +16,7 @@ use Da\User\Helper\AuthHelper;
 use Da\User\Model\AbstractAuthItem;
 use Da\User\Module;
 use Da\User\Service\AuthItemEditionService;
-use Da\User\Traits\ContainerTrait;
+use Da\User\Traits\ContainerAwareTrait;
 use Da\User\Validator\AjaxRequestModelValidator;
 use Yii;
 use yii\filters\AccessControl;
@@ -24,7 +24,7 @@ use yii\web\Controller;
 
 abstract class AbstractAuthItemController extends Controller
 {
-    use ContainerTrait;
+    use ContainerAwareTrait;
 
     protected $modelClass;
     protected $searchModelClass;

lib/User/Controller/AdminController.php

@@ -21,7 +21,7 @@ use Da\User\Search\UserSearch;
 use Da\User\Service\UserBlockService;
 use Da\User\Service\UserConfirmationService;
 use Da\User\Service\UserCreateService;
-use Da\User\Traits\ContainerTrait;
+use Da\User\Traits\ContainerAwareTrait;
 use Da\User\Validator\AjaxRequestModelValidator;
 use Yii;
 use yii\base\Module;
@@ -33,7 +33,7 @@ use yii\web\Controller;
 
 class AdminController extends Controller
 {
-    use ContainerTrait;
+    use ContainerAwareTrait;
 
     /**
      * @var UserQuery

lib/User/Controller/RecoveryController.php

@@ -20,7 +20,7 @@ use Da\User\Query\TokenQuery;
 use Da\User\Query\UserQuery;
 use Da\User\Service\PasswordRecoveryService;
 use Da\User\Service\ResetPasswordService;
-use Da\User\Traits\ContainerTrait;
+use Da\User\Traits\ContainerAwareTrait;
 use Da\User\Validator\AjaxRequestModelValidator;
 use Yii;
 use Da\User\Module;
@@ -30,7 +30,7 @@ use yii\web\NotFoundHttpException;
 
 class RecoveryController extends Controller
 {
-    use ContainerTrait;
+    use ContainerAwareTrait;
 
     protected $userQuery;
     protected $tokenQuery;

lib/User/Controller/RegistrationController.php

@@ -26,7 +26,7 @@ use Da\User\Service\ResendConfirmationService;
 use Da\User\Service\UserConfirmationService;
 use Da\User\Service\UserCreateService;
 use Da\User\Service\UserRegisterService;
-use Da\User\Traits\ContainerTrait;
+use Da\User\Traits\ContainerAwareTrait;
 use Da\User\Validator\AjaxRequestModelValidator;
 use Yii;
 use yii\base\Module;
@@ -36,7 +36,7 @@ use yii\web\NotFoundHttpException;
 
 class RegistrationController extends Controller
 {
-    use ContainerTrait;
+    use ContainerAwareTrait;
 
     protected $userQuery;
     protected $socialNetworkAccountQuery;

lib/User/Controller/SecurityController.php

@@ -18,17 +18,18 @@ use Da\User\Form\LoginForm;
 use Da\User\Query\SocialNetworkAccountQuery;
 use Da\User\Service\SocialNetworkAccountConnectService;
 use Da\User\Service\SocialNetworkAuthenticateService;
-use Da\User\Traits\ContainerTrait;
+use Da\User\Traits\ContainerAwareTrait;
 use yii\authclient\AuthAction;
 use yii\base\Module;
 use yii\filters\AccessControl;
 use yii\filters\VerbFilter;
 use yii\web\Controller;
 use Yii;
+use \yii\web\Response;
 
 class SecurityController extends Controller
 {
-    use ContainerTrait;
+    use ContainerAwareTrait;
 
     protected $socialNetworkAccountQuery;
 
@@ -97,11 +98,16 @@ class SecurityController extends Controller
         ];
     }
 
+    /**
+     * Controller action responsible for handling login page and actions.
+     * @return string|Response
+     */
     public function actionLogin()
     {
         if (!Yii::$app->user->getIsGuest()) {
             return $this->goHome();
         }
+
         /** @var LoginForm $form */
         $form = $this->make(LoginForm::class);
         /** @var FormEvent $event */

lib/User/Controller/SettingsController.php

@@ -25,7 +25,7 @@ use Da\User\Query\ProfileQuery;
 use Da\User\Query\SocialNetworkAccountQuery;
 use Da\User\Query\UserQuery;
 use Da\User\Service\EmailChangeService;
-use Da\User\Traits\ContainerTrait;
+use Da\User\Traits\ContainerAwareTrait;
 use Da\User\Validator\AjaxRequestModelValidator;
 use yii\filters\AccessControl;
 use yii\filters\VerbFilter;
@@ -36,7 +36,7 @@ use yii\web\NotFoundHttpException;
 
 class SettingsController extends Controller
 {
-    use ContainerTrait;
+    use ContainerAwareTrait;
 
     protected $profileQuery;
     protected $userQuery;

lib/User/Form/RecoveryForm.php

@@ -12,13 +12,13 @@
 namespace Da\User\Form;
 
 use Da\User\Query\UserQuery;
-use Da\User\Traits\ContainerTrait;
+use Da\User\Traits\ContainerAwareTrait;
 use Yii;
 use yii\base\Model;
 
 class RecoveryForm extends Model
 {
-    use ContainerTrait;
+    use ContainerAwareTrait;
 
     const SCENARIO_REQUEST = 'request';
     const SCENARIO_RESET = 'reset';

lib/User/Form/RegistrationForm.php

@@ -12,7 +12,7 @@
 namespace Da\User\Form;
 
 use Da\User\Model\User;
-use Da\User\Traits\ContainerTrait;
+use Da\User\Traits\ContainerAwareTrait;
 use Da\User\Traits\ModuleTrait;
 use Yii;
 use yii\base\Model;
@@ -20,7 +20,7 @@ use yii\base\Model;
 class RegistrationForm extends Model
 {
     use ModuleTrait;
-    use ContainerTrait;
+    use ContainerAwareTrait;
 
     /**
      * @var string User email address

lib/User/Form/SettingsForm.php

@@ -14,7 +14,7 @@ namespace Da\User\Form;
 use Da\User\Factory\EmailChangeStrategyFactory;
 use Da\User\Helper\SecurityHelper;
 use Da\User\Model\User;
-use Da\User\Traits\ContainerTrait;
+use Da\User\Traits\ContainerAwareTrait;
 use Da\User\Traits\ModuleTrait;
 use Yii;
 use yii\base\Model;
@@ -22,7 +22,7 @@ use yii\base\Model;
 class SettingsForm extends Model
 {
     use ModuleTrait;
-    use ContainerTrait;
+    use ContainerAwareTrait;
 
     /**
      * @var string

lib/User/Model/Profile.php

@@ -13,7 +13,7 @@ namespace Da\User\Model;
 
 use Da\User\Helper\GravatarHelper;
 use Da\User\Query\ProfileQuery;
-use Da\User\Traits\ContainerTrait;
+use Da\User\Traits\ContainerAwareTrait;
 use Da\User\Traits\ModuleTrait;
 use Da\User\Validator\TimeZoneValidator;
 use Yii;
@@ -37,7 +37,7 @@ use DateTime;
 class Profile extends ActiveRecord
 {
     use ModuleTrait;
-    use ContainerTrait;
+    use ContainerAwareTrait;
 
     /**
      * {@inheritdoc}

lib/User/Model/SocialNetworkAccount.php

@@ -12,7 +12,7 @@
 namespace Da\User\Model;
 
 use Da\User\Query\SocialNetworkAccountQuery;
-use Da\User\Traits\ContainerTrait;
+use Da\User\Traits\ContainerAwareTrait;
 use Da\User\Traits\ModuleTrait;
 use Yii;
 use yii\db\ActiveRecord;
@@ -35,7 +35,7 @@ use yii\helpers\Url;
 class SocialNetworkAccount extends ActiveRecord
 {
     use ModuleTrait;
-    use ContainerTrait;
+    use ContainerAwareTrait;
 
     /**
      * @var array json decoded properties

lib/User/Model/Token.php

@@ -13,7 +13,7 @@ namespace Da\User\Model;
 
 use Da\User\Helper\SecurityHelper;
 use Da\User\Query\TokenQuery;
-use Da\User\Traits\ContainerTrait;
+use Da\User\Traits\ContainerAwareTrait;
 use Da\User\Traits\ModuleTrait;
 use yii\db\ActiveRecord;
 use yii\helpers\Url;
@@ -33,7 +33,7 @@ use RuntimeException;
 class Token extends ActiveRecord
 {
     use ModuleTrait;
-    use ContainerTrait;
+    use ContainerAwareTrait;
 
     const TYPE_CONFIRMATION = 0;
     const TYPE_RECOVERY = 1;

lib/User/Model/User.php

@@ -13,7 +13,7 @@ namespace Da\User\Model;
 
 use Da\User\Helper\SecurityHelper;
 use Da\User\Query\UserQuery;
-use Da\User\Traits\ContainerTrait;
+use Da\User\Traits\ContainerAwareTrait;
 use Da\User\Traits\ModuleTrait;
 use Yii;
 use yii\base\NotSupportedException;
@@ -51,7 +51,7 @@ use yii\web\IdentityInterface;
 class User extends ActiveRecord implements IdentityInterface
 {
     use ModuleTrait;
-    use ContainerTrait;
+    use ContainerAwareTrait;
 
     // following constants are used on secured email changing process
     const OLD_EMAIL_CONFIRMED = 0b1;

lib/User/Search/AbstractAuthItemSearch.php

@@ -12,7 +12,7 @@
 namespace Da\User\Search;
 
 use Da\User\Traits\AuthManagerTrait;
-use Da\User\Traits\ContainerTrait;
+use Da\User\Traits\ContainerAwareTrait;
 use yii\base\Model;
 use yii\data\ArrayDataProvider;
 use yii\db\Query;
@@ -20,7 +20,7 @@ use yii\db\Query;
 abstract class AbstractAuthItemSearch extends Model
 {
     use AuthManagerTrait;
-    use ContainerTrait;
+    use ContainerAwareTrait;
 
     /**
      * @var string

lib/User/Service/AuthItemEditionService.php

@@ -15,13 +15,13 @@ use Da\User\Contracts\ServiceInterface;
 use Da\User\Factory\AuthItemFactory;
 use Da\User\Model\AbstractAuthItem;
 use Da\User\Traits\AuthManagerTrait;
-use Da\User\Traits\ContainerTrait;
+use Da\User\Traits\ContainerAwareTrait;
 use Exception;
 
 class AuthItemEditionService implements ServiceInterface
 {
     use AuthManagerTrait;
-    use ContainerTrait;
+    use ContainerAwareTrait;
 
     protected $model;
 

lib/User/Service/SocialNetworkAccountConnectService.php

@@ -18,12 +18,12 @@ use Da\User\Event\SocialNetworkAuthEvent;
 use Da\User\Model\SocialNetworkAccount;
 use Da\User\Model\User;
 use Da\User\Query\SocialNetworkAccountQuery;
-use Da\User\Traits\ContainerTrait;
+use Da\User\Traits\ContainerAwareTrait;
 use Yii;
 
 class SocialNetworkAccountConnectService implements ServiceInterface
 {
-    use ContainerTrait;
+    use ContainerAwareTrait;
 
     protected $controller;
     protected $client;

lib/User/Strategy/DefaultEmailChangeStrategy.php

@@ -15,12 +15,12 @@ use Da\User\Contracts\MailChangeStrategyInterface;
 use Da\User\Factory\MailFactory;
 use Da\User\Factory\TokenFactory;
 use Da\User\Form\SettingsForm;
-use Da\User\Traits\ContainerTrait;
+use Da\User\Traits\ContainerAwareTrait;
 use Yii;
 
 class DefaultEmailChangeStrategy implements MailChangeStrategyInterface
 {
-    use ContainerTrait;
+    use ContainerAwareTrait;
 
     protected $form;
 

lib/User/Strategy/SecureEmailChangeStrategy.php

@@ -16,12 +16,12 @@ use Da\User\Factory\MailFactory;
 use Da\User\Factory\TokenFactory;
 use Da\User\Form\SettingsForm;
 use Da\User\Model\User;
-use Da\User\Traits\ContainerTrait;
+use Da\User\Traits\ContainerAwareTrait;
 use Yii;
 
 class SecureEmailChangeStrategy implements MailChangeStrategyInterface
 {
-    use ContainerTrait;
+    use ContainerAwareTrait;
 
     protected $form;
 

lib/User/Traits/ContainerAwareTrait.php

@@ -21,7 +21,7 @@ use yii\di\Container;
  * @property-ready Da\User\Helper\AuthHelper $auth
  * @property-ready Da\User\Helper\ClassMapHelper $classMap
  */
-trait ContainerTrait
+trait ContainerAwareTrait
 {
     /**
      * @return Container

lib/User/Widget/AssignmentsWidget.php

@@ -14,7 +14,7 @@ namespace Da\User\Widget;
 use Da\User\Model\Assignment;
 use Da\User\Service\UpdateAuthAssignmentsService;
 use Da\User\Traits\AuthManagerTrait;
-use Da\User\Traits\ContainerTrait;
+use Da\User\Traits\ContainerAwareTrait;
 use yii\base\InvalidConfigException;
 use yii\base\Widget;
 use yii\helpers\ArrayHelper;
@@ -22,7 +22,7 @@ use yii\helpers\ArrayHelper;
 class AssignmentsWidget extends Widget
 {
     use AuthManagerTrait;
-    use ContainerTrait;
+    use ContainerAwareTrait;
 
     /**
      * @var int ID of the user to whom auth items will be assigned