Skip to content
This repository was archived by the owner on Sep 19, 2023. It is now read-only.

Commit 8bd2212

Browse files
authored
Merge pull request #34 from justcoded/develop
Replaced className with PHP ::class in configs; added yii shell
2 parents d4edcf0 + 23cac42 commit 8bd2212

File tree

7 files changed

+14
-13
lines changed

7 files changed

+14
-13
lines changed

app/controllers/AuthController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public function behaviors()
2121
{
2222
return [
2323
'access' => [
24-
'class' => AccessControl::className(),
24+
'class' => AccessControl::class,
2525
'only' => ['logout'],
2626
'rules' => [
2727
[
@@ -32,7 +32,7 @@ public function behaviors()
3232
],
3333
],
3434
'verbs' => [
35-
'class' => VerbFilter::className(),
35+
'class' => VerbFilter::class,
3636
'actions' => [
3737
'logout' => ['post'],
3838
],

app/forms/RegisterForm.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function rules()
2525
return [
2626
[['email', 'password', 'passwordRepeat', 'firstName', 'lastName'], 'required'],
2727
['email', 'email'],
28-
['email', 'unique', 'targetClass' => User::className()],
28+
['email', 'unique', 'targetClass' => User::class],
2929
['passwordRepeat', 'compare', 'compareAttribute' => 'password'],
3030
];
3131
}

app/models/ActiveRecord.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ abstract class ActiveRecord extends \yii\db\ActiveRecord
1818
public function behaviors()
1919
{
2020
return [
21-
TimestampBehavior::className(),
21+
TimestampBehavior::class,
2222
];
2323
}
2424
}

app/modules/admin/controllers/UsersController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class UsersController extends Controller
2222
public function init()
2323
{
2424
parent::init();
25-
$this->modelClass = UserForm::className();
25+
$this->modelClass = UserForm::class;
2626
}
2727

2828
/**
@@ -32,7 +32,7 @@ public function behaviors()
3232
{
3333
return [
3434
'verbs' => [
35-
'class' => VerbFilter::className(),
35+
'class' => VerbFilter::class,
3636
'actions' => [
3737
'delete' => ['POST'],
3838
],

app/views/site/contact.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353

5454
<?= $form->field($model, 'body')->textarea(['rows' => 6]) ?>
5555

56-
<?= $form->field($model, 'verifyCode')->widget(Captcha::className(), [
56+
<?= $form->field($model, 'verifyCode')->widget(Captcha::class, [
5757
'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>',
5858
]) ?>
5959

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"require-dev": {
2121
"yiisoft/yii2-debug": "~2.0.0",
2222
"yiisoft/yii2-gii": "~2.0.0",
23+
"yiisoft/yii2-shell": "~2.0.0",
2324
"codeception/base": "^2.2.3",
2425
"codeception/verify": "~0.3.1",
2526
"codeception/specify": "~0.4.3"

config/rbac.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
return [
1010
'as adminAccess' => [
1111
// TODO: write own class to simplify this check.
12-
'class' => AccessControl::className(),
12+
'class' => AccessControl::class,
1313
'rules' => [
14-
// custom rule to deny access to "/admin/*" if user doesn't have permission 'administer'
14+
// custom rule to deny access to "/admin/*" if user doesn't have permission 'administer'.
1515
[
1616
'allow' => false,
1717
'controllers' => ['admin/*'],
@@ -30,19 +30,19 @@
3030
],
3131
],
3232
],
33-
// Route based permission filter
33+
// Route based permission filter.
3434
'as routeAccess' => [
35-
'class' => 'justcoded\yii2\rbac\filters\RouteAccessControl',
35+
'class' => \justcoded\yii2\rbac\filters\RouteAccessControl::class,
3636
'allowActions' => [
3737
'site/*',
3838
'auth/*',
3939
],
4040
],
4141

42-
// authManager settings
42+
// authManager settings.
4343
'components' => [
4444
'authManager' => [
45-
'class' => 'justcoded\yii2\rbac\components\DbManager',
45+
'class' => \justcoded\yii2\rbac\components\DbManager::class,
4646
'defaultRoles' => ['Guest'],
4747
],
4848
],

0 commit comments

Comments
 (0)