wip
This commit is contained in:
@ -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
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
/**
|
||||
|
||||
@ -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;
|
||||
|
||||
/**
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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
|
||||
|
||||
Reference in New Issue
Block a user