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

Merge remote-tracking branch 'upstream/master' into dev-ctrlr-modules

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Tõnis Ormisson
2018-09-15 10:18:50 +03:00
parent 41d576911e 6aaa687e81
commit c3db1ba35c
17 changed files with 45 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,9 +51,9 @@ abstract class AbstractAuthItemController extends Controller
{
return [
'access' => [
'class' => AccessControl::className(),
'class' => AccessControl::class,
'ruleConfig' => [
'class' => AccessRuleFilter::className(),
'class' => AccessRuleFilter::class,
],
'rules' => [
[

2
src/User/Controller/ProfileController.php
View File

@ -43,7 +43,7 @@ class ProfileController extends Controller
{
return [
'access' => [
'class' => AccessControl::className(),
'class' => AccessControl::class,
'rules' => [
[
'allow' => true,

2
src/User/Controller/RecoveryController.php
View File

@ -63,7 +63,7 @@ class RecoveryController extends Controller
{
return [
'access' => [
'class' => AccessControl::className(),
'class' => AccessControl::class,
'rules' => [
[
'allow' => true,

2
src/User/Controller/RegistrationController.php
View File

@ -72,7 +72,7 @@ class RegistrationController extends Controller
{
return [
'access' => [
'class' => AccessControl::className(),
'class' => AccessControl::class,
'rules' => [
[
'allow' => true,

6
src/User/Controller/RuleController.php
View File

@ -36,15 +36,15 @@ class RuleController extends Controller
{
return [
'verbs' => [
'class' => VerbFilter::className(),
'class' => VerbFilter::class,
'actions' => [
'delete' => ['POST'],
],
],
'access' => [
'class' => AccessControl::className(),
'class' => AccessControl::class,
'ruleConfig' => [
'class' => AccessRuleFilter::className(),
'class' => AccessRuleFilter::class,
],
'rules' => [
[

6
src/User/Controller/SecurityController.php
View File

@ -64,7 +64,7 @@ class SecurityController extends Controller
{
return [
'access' => [
'class' => AccessControl::className(),
'class' => AccessControl::class,
'rules' => [
[
'allow' => true,
@ -79,7 +79,7 @@ class SecurityController extends Controller
],
],
'verbs' => [
'class' => VerbFilter::className(),
'class' => VerbFilter::class,
'actions' => [
'logout' => ['post'],
],
@ -94,7 +94,7 @@ class SecurityController extends Controller
{
return [
'auth' => [
'class' => AuthAction::className(),
'class' => AuthAction::class,
// if user is not logged in, will try to log him in, otherwise
// will try to connect social account to user.
'successCallback' => Yii::$app->user->isGuest

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

@ -89,7 +89,7 @@ class SettingsController extends Controller
{
return [
'verbs' => [
'class' => VerbFilter::className(),
'class' => VerbFilter::class,
'actions' => [
'disconnect' => ['post'],
'delete' => ['post'],
@ -97,7 +97,7 @@ class SettingsController extends Controller
],
],
'access' => [
'class' => AccessControl::className(),
'class' => AccessControl::class,
'rules' => [
[
'allow' => true,