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

# Conflicts: # CHANGELOG.md
2018-09-15 10:18:50 +03:00
parent 41d576911e 6aaa687e81
commit c3db1ba35c
17 changed files with 45 additions and 26 deletions
--- a/src/User/Controller/SettingsController.php
+++ b/src/User/Controller/SettingsController.php
@ -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,