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/RecoveryController.php
+++ b/src/User/Controller/RecoveryController.php
@ -63,7 +63,7 @@ class RecoveryController extends Controller
    {
        return [
            'access' => [
-                'class' => AccessControl::className(),
+                'class' => AccessControl::class,
                'rules' => [
                    [
                        'allow' => true,