ContainerTrait -> ContainerAwareTrait

This commit is contained in:
resurtm
2016-12-21 12:01:47 +06:00
parent 6505af2e46
commit 05566c0c58
24 changed files with 51 additions and 45 deletions

View File

@ -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}

View File

@ -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

View File

@ -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;

View File

@ -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;