leonardo/yii2-usuario
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ContainerTrait -> ContainerAwareTrait

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/User/Controller/AbstractAuthItemController.php
View File

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

4
lib/User/Controller/AdminController.php
View File

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

4
lib/User/Controller/RecoveryController.php
View File

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

4
lib/User/Controller/RegistrationController.php
View File

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

10
lib/User/Controller/SecurityController.php
View File

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

4
lib/User/Controller/SettingsController.php
View File

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