wip

lib/User/Form/LoginForm.php

@@ -14,13 +14,13 @@ namespace Da\User\Form;
 use Da\User\Helper\SecurityHelper;
 use Da\User\Model\User;
 use Da\User\Query\UserQuery;
-use Da\User\Traits\ModuleTrait;
+use Da\User\Traits\ModuleAwareTrait;
 use Yii;
 use yii\base\Model;
 
 class LoginForm extends Model
 {
-    use ModuleTrait;
+    use ModuleAwareTrait;
 
     /**
      * @var string login User's email or username

lib/User/Form/RegistrationForm.php

@@ -13,13 +13,13 @@ namespace Da\User\Form;
 
 use Da\User\Model\User;
 use Da\User\Traits\ContainerAwareTrait;
-use Da\User\Traits\ModuleTrait;
+use Da\User\Traits\ModuleAwareTrait;
 use Yii;
 use yii\base\Model;
 
 class RegistrationForm extends Model
 {
-    use ModuleTrait;
+    use ModuleAwareTrait;
     use ContainerAwareTrait;
 
     /**

lib/User/Form/SettingsForm.php

@@ -15,13 +15,13 @@ use Da\User\Factory\EmailChangeStrategyFactory;
 use Da\User\Helper\SecurityHelper;
 use Da\User\Model\User;
 use Da\User\Traits\ContainerAwareTrait;
-use Da\User\Traits\ModuleTrait;
+use Da\User\Traits\ModuleAwareTrait;
 use Yii;
 use yii\base\Model;
 
 class SettingsForm extends Model
 {
-    use ModuleTrait;
+    use ModuleAwareTrait;
     use ContainerAwareTrait;
 
     /**

lib/User/Helper/AuthHelper.php

@@ -13,7 +13,7 @@ namespace Da\User\Helper;
 
 use Da\User\Model\AbstractAuthItem;
 use Da\User\Module;
-use Da\User\Traits\AuthManagerTrait;
+use Da\User\Traits\AuthManagerAwareTrait;
 use Yii;
 use yii\helpers\ArrayHelper;
 use yii\rbac\Permission;
@@ -22,7 +22,7 @@ use yii\rbac\Rule;
 
 class AuthHelper
 {
-    use AuthManagerTrait;
+    use AuthManagerAwareTrait;
 
     /**
      * Checks whether a user has certain role.

lib/User/Model/AbstractAuthItem.php

@@ -11,7 +11,7 @@
 
 namespace Da\User\Model;
 
-use Da\User\Traits\AuthManagerTrait;
+use Da\User\Traits\AuthManagerAwareTrait;
 use Da\User\Validator\RbacItemsValidator;
 use Da\User\Validator\RbacRuleValidator;
 use yii\base\Model;
@@ -20,7 +20,7 @@ use Yii;
 
 abstract class AbstractAuthItem extends Model
 {
-    use AuthManagerTrait;
+    use AuthManagerAwareTrait;
 
     /**
      * @var string

lib/User/Model/Assignment.php

@@ -11,7 +11,7 @@
 
 namespace Da\User\Model;
 
-use Da\User\Traits\AuthManagerTrait;
+use Da\User\Traits\AuthManagerAwareTrait;
 use Da\User\Validator\RbacItemsValidator;
 use yii\base\InvalidConfigException;
 use yii\base\Model;
@@ -19,7 +19,7 @@ use Yii;
 
 class Assignment extends Model
 {
-    use AuthManagerTrait;
+    use AuthManagerAwareTrait;
 
     public $items = [];
     public $user_id;

lib/User/Model/Profile.php

@@ -14,7 +14,7 @@ namespace Da\User\Model;
 use Da\User\Helper\GravatarHelper;
 use Da\User\Query\ProfileQuery;
 use Da\User\Traits\ContainerAwareTrait;
-use Da\User\Traits\ModuleTrait;
+use Da\User\Traits\ModuleAwareTrait;
 use Da\User\Validator\TimeZoneValidator;
 use Yii;
 use yii\db\ActiveRecord;
@@ -36,7 +36,7 @@ use DateTime;
  */
 class Profile extends ActiveRecord
 {
-    use ModuleTrait;
+    use ModuleAwareTrait;
     use ContainerAwareTrait;
 
     /**

lib/User/Model/SocialNetworkAccount.php

@@ -13,7 +13,7 @@ namespace Da\User\Model;
 
 use Da\User\Query\SocialNetworkAccountQuery;
 use Da\User\Traits\ContainerAwareTrait;
-use Da\User\Traits\ModuleTrait;
+use Da\User\Traits\ModuleAwareTrait;
 use Yii;
 use yii\db\ActiveRecord;
 use yii\helpers\Url;
@@ -34,7 +34,7 @@ use yii\helpers\Url;
  */
 class SocialNetworkAccount extends ActiveRecord
 {
-    use ModuleTrait;
+    use ModuleAwareTrait;
     use ContainerAwareTrait;
 
     /**

lib/User/Model/Token.php

@@ -14,10 +14,10 @@ namespace Da\User\Model;
 use Da\User\Helper\SecurityHelper;
 use Da\User\Query\TokenQuery;
 use Da\User\Traits\ContainerAwareTrait;
-use Da\User\Traits\ModuleTrait;
+use Da\User\Traits\ModuleAwareTrait;
+use RuntimeException;
 use yii\db\ActiveRecord;
 use yii\helpers\Url;
-use RuntimeException;
 
 /**
  * Token Active Record model.
@@ -32,7 +32,7 @@ use RuntimeException;
  */
 class Token extends ActiveRecord
 {
-    use ModuleTrait;
+    use ModuleAwareTrait;
     use ContainerAwareTrait;
 
     const TYPE_CONFIRMATION = 0;

lib/User/Model/User.php

@@ -14,7 +14,7 @@ namespace Da\User\Model;
 use Da\User\Helper\SecurityHelper;
 use Da\User\Query\UserQuery;
 use Da\User\Traits\ContainerAwareTrait;
-use Da\User\Traits\ModuleTrait;
+use Da\User\Traits\ModuleAwareTrait;
 use Yii;
 use yii\base\NotSupportedException;
 use yii\behaviors\TimestampBehavior;
@@ -50,7 +50,7 @@ use yii\web\IdentityInterface;
  */
 class User extends ActiveRecord implements IdentityInterface
 {
-    use ModuleTrait;
+    use ModuleAwareTrait;
     use ContainerAwareTrait;
 
     // following constants are used on secured email changing process

lib/User/Search/AbstractAuthItemSearch.php

@@ -11,7 +11,7 @@
 
 namespace Da\User\Search;
 
-use Da\User\Traits\AuthManagerTrait;
+use Da\User\Traits\AuthManagerAwareTrait;
 use Da\User\Traits\ContainerAwareTrait;
 use yii\base\Model;
 use yii\data\ArrayDataProvider;
@@ -19,7 +19,7 @@ use yii\db\Query;
 
 abstract class AbstractAuthItemSearch extends Model
 {
-    use AuthManagerTrait;
+    use AuthManagerAwareTrait;
     use ContainerAwareTrait;
 
     /**

lib/User/Service/AuthItemEditionService.php

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

lib/User/Service/EmailChangeService.php

@@ -8,12 +8,12 @@ use Da\User\Model\Token;
 use Da\User\Model\User;
 use Da\User\Query\TokenQuery;
 use Da\User\Query\UserQuery;
-use Da\User\Traits\ModuleTrait;
+use Da\User\Traits\ModuleAwareTrait;
 use Yii;
 
 class EmailChangeService implements ServiceInterface
 {
-    use ModuleTrait;
+    use ModuleAwareTrait;
 
     protected $code;
     protected $model;

lib/User/Service/UpdateAuthAssignmentsService.php

@@ -13,11 +13,11 @@ namespace Da\User\Service;
 
 use Da\User\Contracts\ServiceInterface;
 use Da\User\Model\Assignment;
-use Da\User\Traits\AuthManagerTrait;
+use Da\User\Traits\AuthManagerAwareTrait;
 
 class UpdateAuthAssignmentsService implements ServiceInterface
 {
-    use AuthManagerTrait;
+    use AuthManagerAwareTrait;
 
     protected $model;
 

lib/User/Service/UserRegisterService.php

@@ -15,16 +15,15 @@ use Da\User\Contracts\ServiceInterface;
 use Da\User\Event\UserEvent;
 use Da\User\Factory\TokenFactory;
 use Da\User\Helper\SecurityHelper;
-use Da\User\Model\Token;
 use Da\User\Model\User;
-use Da\User\Traits\ModuleTrait;
+use Da\User\Traits\ModuleAwareTrait;
+use Exception;
 use yii\base\InvalidCallException;
 use yii\log\Logger;
-use Exception;
 
 class UserRegisterService implements ServiceInterface
 {
-    use ModuleTrait;
+    use ModuleAwareTrait;
 
     protected $model;
     protected $securityHelper;

lib/User/Traits/AuthManagerAwareTrait.php

@@ -14,7 +14,7 @@ namespace Da\User\Traits;
 use Da\User\Component\AuthDbManagerComponent;
 use Yii;
 
-trait AuthManagerTrait
+trait AuthManagerAwareTrait
 {
     /**
      * @return AuthDbManagerComponent|\yii\rbac\ManagerInterface

lib/User/Traits/ModuleAwareTrait.php

@@ -17,10 +17,10 @@ use Yii;
 /**
  * @property-read Module $module
  */
-trait ModuleTrait
+trait ModuleAwareTrait
 {
     /**
-     * @return \Da\User\Module
+     * @return Module
      */
     public function getModule()
     {

lib/User/Validator/RbacItemsValidator.php

@@ -11,13 +11,13 @@
 
 namespace Da\User\Validator;
 
-use Da\User\Traits\AuthManagerTrait;
+use Da\User\Traits\AuthManagerAwareTrait;
 use Yii;
 use yii\validators\Validator;
 
 class RbacItemsValidator extends Validator
 {
-    use AuthManagerTrait;
+    use AuthManagerAwareTrait;
 
     protected function validateValue($value)
     {

lib/User/Widget/AssignmentsWidget.php

@@ -13,7 +13,7 @@ namespace Da\User\Widget;
 
 use Da\User\Model\Assignment;
 use Da\User\Service\UpdateAuthAssignmentsService;
-use Da\User\Traits\AuthManagerTrait;
+use Da\User\Traits\AuthManagerAwareTrait;
 use Da\User\Traits\ContainerAwareTrait;
 use yii\base\InvalidConfigException;
 use yii\base\Widget;
@@ -21,7 +21,7 @@ use yii\helpers\ArrayHelper;
 
 class AssignmentsWidget extends Widget
 {
-    use AuthManagerTrait;
+    use AuthManagerAwareTrait;
     use ContainerAwareTrait;
 
     /**