From e9bca868288de6819e6f86ac3636cc32668a81bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=B5nis=20Ormisson?= Date: Tue, 11 Sep 2018 22:58:21 +0300 Subject: [PATCH] DEV: replace deprecated ::className() with ::class (#232) --- src/User/Controller/AbstractAuthItemController.php | 4 ++-- src/User/Controller/ProfileController.php | 2 +- src/User/Controller/RecoveryController.php | 2 +- src/User/Controller/RegistrationController.php | 2 +- src/User/Controller/RuleController.php | 6 +++--- src/User/Controller/SecurityController.php | 6 +++--- src/User/Controller/SettingsController.php | 4 ++-- src/User/Model/User.php | 2 +- src/User/resources/views/permission/index.php | 2 +- src/User/resources/views/role/index.php | 2 +- src/User/resources/views/rule/index.php | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/User/Controller/AbstractAuthItemController.php b/src/User/Controller/AbstractAuthItemController.php index 65d0f3f..4b49465 100644 --- a/src/User/Controller/AbstractAuthItemController.php +++ b/src/User/Controller/AbstractAuthItemController.php @@ -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' => [ [ diff --git a/src/User/Controller/ProfileController.php b/src/User/Controller/ProfileController.php index 9852d7c..2e99fe1 100644 --- a/src/User/Controller/ProfileController.php +++ b/src/User/Controller/ProfileController.php @@ -43,7 +43,7 @@ class ProfileController extends Controller { return [ 'access' => [ - 'class' => AccessControl::className(), + 'class' => AccessControl::class, 'rules' => [ [ 'allow' => true, diff --git a/src/User/Controller/RecoveryController.php b/src/User/Controller/RecoveryController.php index cd2f621..00e4ec7 100644 --- a/src/User/Controller/RecoveryController.php +++ b/src/User/Controller/RecoveryController.php @@ -60,7 +60,7 @@ class RecoveryController extends Controller { return [ 'access' => [ - 'class' => AccessControl::className(), + 'class' => AccessControl::class, 'rules' => [ [ 'allow' => true, diff --git a/src/User/Controller/RegistrationController.php b/src/User/Controller/RegistrationController.php index 8c97bce..f321413 100644 --- a/src/User/Controller/RegistrationController.php +++ b/src/User/Controller/RegistrationController.php @@ -69,7 +69,7 @@ class RegistrationController extends Controller { return [ 'access' => [ - 'class' => AccessControl::className(), + 'class' => AccessControl::class, 'rules' => [ [ 'allow' => true, diff --git a/src/User/Controller/RuleController.php b/src/User/Controller/RuleController.php index ccd6134..74626ca 100644 --- a/src/User/Controller/RuleController.php +++ b/src/User/Controller/RuleController.php @@ -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' => [ [ diff --git a/src/User/Controller/SecurityController.php b/src/User/Controller/SecurityController.php index 00c373e..403e406 100644 --- a/src/User/Controller/SecurityController.php +++ b/src/User/Controller/SecurityController.php @@ -61,7 +61,7 @@ class SecurityController extends Controller { return [ 'access' => [ - 'class' => AccessControl::className(), + 'class' => AccessControl::class, 'rules' => [ [ 'allow' => true, @@ -76,7 +76,7 @@ class SecurityController extends Controller ], ], 'verbs' => [ - 'class' => VerbFilter::className(), + 'class' => VerbFilter::class, 'actions' => [ 'logout' => ['post'], ], @@ -91,7 +91,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 diff --git a/src/User/Controller/SettingsController.php b/src/User/Controller/SettingsController.php index 16fe6d8..3ada228 100644 --- a/src/User/Controller/SettingsController.php +++ b/src/User/Controller/SettingsController.php @@ -86,7 +86,7 @@ class SettingsController extends Controller { return [ 'verbs' => [ - 'class' => VerbFilter::className(), + 'class' => VerbFilter::class, 'actions' => [ 'disconnect' => ['post'], 'delete' => ['post'], @@ -94,7 +94,7 @@ class SettingsController extends Controller ], ], 'access' => [ - 'class' => AccessControl::className(), + 'class' => AccessControl::class, 'rules' => [ [ 'allow' => true, diff --git a/src/User/Model/User.php b/src/User/Model/User.php index d333453..c4fc048 100644 --- a/src/User/Model/User.php +++ b/src/User/Model/User.php @@ -161,7 +161,7 @@ class User extends ActiveRecord implements IdentityInterface public function behaviors() { $behaviors = [ - TimestampBehavior::className(), + TimestampBehavior::class, ]; if ($this->module->enableGDPRcompliance) { diff --git a/src/User/resources/views/permission/index.php b/src/User/resources/views/permission/index.php index a3f3958..18c61a6 100644 --- a/src/User/resources/views/permission/index.php +++ b/src/User/resources/views/permission/index.php @@ -53,7 +53,7 @@ $this->params['breadcrumbs'][] = $this->title; ], ], [ - 'class' => ActionColumn::className(), + 'class' => ActionColumn::class, 'template' => '{update} {delete}', 'urlCreator' => function ($action, $model) { return Url::to(['/user/permission/' . $action, 'name' => $model['name']]); diff --git a/src/User/resources/views/role/index.php b/src/User/resources/views/role/index.php index 0713f4c..e18b817 100644 --- a/src/User/resources/views/role/index.php +++ b/src/User/resources/views/role/index.php @@ -54,7 +54,7 @@ $this->params['breadcrumbs'][] = $this->title; ], ], [ - 'class' => ActionColumn::className(), + 'class' => ActionColumn::class, 'template' => '{update} {delete}', 'urlCreator' => function ($action, $model) { return Url::to(['/user/role/' . $action, 'name' => $model['name']]); diff --git a/src/User/resources/views/rule/index.php b/src/User/resources/views/rule/index.php index 9724ec8..7e5e15d 100644 --- a/src/User/resources/views/rule/index.php +++ b/src/User/resources/views/rule/index.php @@ -60,7 +60,7 @@ $this->params['breadcrumbs'][] = $this->title; ], ], [ - 'class' => ActionColumn::className(), + 'class' => ActionColumn::class, 'template' => '{update} {delete}', 'urlCreator' => function ($action, $model) { return Url::to(['/user/rule/' . $action, 'name' => $model['name']]);