humhub · luke- · Oct 25, 2023 · Oct 25, 2023
diff --git a/CHANGELOG-DEV.md b/CHANGELOG-DEV.md
@@ -17,6 +17,7 @@ HumHub Changelog
 - Enh #6512: Show error messages when DB connection configuration is invalid
 - Enh #5315: Default stream sort by `created_at` instead of `id`
 - Fix #6337: Update `created_at` after first publishing of content record
+- Fix #6631: Fix visibility of the method `Controller::getAccessRules()`
 
 1.15.0-beta.2 (Unreleased)
 --------------------------

diff --git a/protected/humhub/components/behaviors/AccessControl.php b/protected/humhub/components/behaviors/AccessControl.php
@@ -24,7 +24,7 @@
  * Disable guest access for all controller actions:
  *
  * ```php
- * public function getAccessRules()
+ * protected function getAccessRules()
  * {
  *     return [
  *          ['login']
@@ -35,7 +35,7 @@
  * Disable guest access for specific controller actions:
  *
  * ```php
- * public function getAccessRules()
+ * protected function getAccessRules()
  * {
  *     return [
  *          ['login' => ['action1', 'action2']]
@@ -46,7 +46,7 @@
  * All users have to be logged in + additional permission check for 'action1' and 'action2':
  *
  * ```php
- * public function getAccessRules()
+ * protected function getAccessRules()
  * {
  *     return [
  *          ['login'],
@@ -58,7 +58,7 @@
  * Custom inline validator for action 'action1':
  *
  * ```php
- * public function getAccessRules()
+ * protected function getAccessRules()
  * {
  *     return [
  *          ['validateMyCustomRule', 'someParameter' => 'someValue', 'actions' => ['action1']]

diff --git a/protected/humhub/controllers/OembedController.php b/protected/humhub/controllers/OembedController.php
@@ -22,7 +22,7 @@ class OembedController extends Controller
     /**
      * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [['login']];
     }

diff --git a/protected/humhub/modules/activity/controllers/AdminController.php b/protected/humhub/modules/activity/controllers/AdminController.php
@@ -25,7 +25,7 @@ class AdminController extends Controller
     /**
      * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [
             ['permissions' => ManageSettings::class],

diff --git a/protected/humhub/modules/admin/components/Controller.php b/protected/humhub/modules/admin/components/Controller.php
@@ -62,12 +62,9 @@ public function behaviors()
     }
 
     /**
-     * Returns access rules for the standard access control behavior
-     *
-     * @return array the access permissions
-     * @see AccessControl
+     * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         // Use by default ManageSettings permission if method is not overwritten by custom module
         if ($this->module->id !== 'admin') {

diff --git a/protected/humhub/modules/admin/controllers/ApprovalController.php b/protected/humhub/modules/admin/controllers/ApprovalController.php
@@ -39,13 +39,13 @@ public function init()
     {
         $this->subLayout = '@admin/views/layouts/user';
         $this->appendPageTitle(Yii::t('AdminModule.base', 'Approval'));
-        return parent::init();
+        parent::init();
     }
 
     /**
      * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [
             [ControllerAccess::RULE_LOGGED_IN_ONLY],

diff --git a/protected/humhub/modules/admin/controllers/AuthenticationController.php b/protected/humhub/modules/admin/controllers/AuthenticationController.php
@@ -38,13 +38,13 @@ public function init()
 
         $this->subLayout = '@admin/views/layouts/user';
 
-        return parent::init();
+        parent::init();
     }
 
     /**
      * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [
             ['permissions' => ManageSettings::class]

diff --git a/protected/humhub/modules/admin/controllers/GroupController.php b/protected/humhub/modules/admin/controllers/GroupController.php
@@ -42,13 +42,13 @@ public function init()
         $this->subLayout = '@admin/views/layouts/user';
         $this->appendPageTitle(Yii::t('AdminModule.base', 'Groups'));
 
-        return parent::init();
+        parent::init();
     }
 
     /**
      * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [
             ['permissions' => ManageGroups::class],

diff --git a/protected/humhub/modules/admin/controllers/InformationController.php b/protected/humhub/modules/admin/controllers/InformationController.php
@@ -37,16 +37,19 @@ class InformationController extends Controller
      */
     public $defaultAction = 'about';
 
+    /**
+     * @inheritdoc
+     */
     public function init()
     {
         $this->subLayout = '@admin/views/layouts/information';
-        return parent::init();
+        parent::init();
     }
 
     /**
      * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [
             ['permissions' => \humhub\modules\admin\permissions\SeeAdminInformation::class],

diff --git a/protected/humhub/modules/admin/controllers/LoggingController.php b/protected/humhub/modules/admin/controllers/LoggingController.php
@@ -32,13 +32,13 @@ public function init()
         $this->appendPageTitle(Yii::t('AdminModule.base', 'Logging'));
         $this->subLayout = '@admin/views/layouts/information';
 
-		return parent::init();
+        parent::init();
     }
 
     /**
      * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [
             ['permissions' => SeeAdminInformation::class]

diff --git a/protected/humhub/modules/admin/controllers/ModuleController.php b/protected/humhub/modules/admin/controllers/ModuleController.php
@@ -39,15 +39,14 @@ public function init()
     {
         $this->appendPageTitle(Yii::t('AdminModule.base', 'Modules'));
 
-        return parent::init();
+        parent::init();
     }
 
     /**
      * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
-
         return [
             ['permissions' => [ManageModules::class]],
             ['permissions' => [ManageSettings::class], 'actions' => ['index', 'list']]

diff --git a/protected/humhub/modules/admin/controllers/PendingRegistrationsController.php b/protected/humhub/modules/admin/controllers/PendingRegistrationsController.php
@@ -34,7 +34,7 @@ public function init()
     /**
      * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [
             [

diff --git a/protected/humhub/modules/admin/controllers/SettingController.php b/protected/humhub/modules/admin/controllers/SettingController.php
@@ -28,7 +28,6 @@
 use humhub\modules\admin\components\Controller;
 use humhub\modules\admin\models\Log;
 use humhub\modules\notification\models\forms\NotificationSettings;
-use yii\base\BaseObject;
 
 /**
  * SettingController
@@ -65,13 +64,13 @@ public function init()
         ]);
         $this->subLayout = '@admin/views/layouts/setting';
 
-        return parent::init();
+        parent::init();
     }
 
     /**
      * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [
             ['permissions' => ManageSettings::class]

diff --git a/protected/humhub/modules/admin/controllers/SpaceController.php b/protected/humhub/modules/admin/controllers/SpaceController.php
@@ -41,13 +41,13 @@ public function init()
         $this->subLayout = '@admin/views/layouts/space';
         $this->appendPageTitle(Yii::t('AdminModule.base', 'Spaces'));
 
-        return parent::init();
+        parent::init();
     }
 
     /**
      * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [
             ['permissions' => [ManageSpaces::class, ManageSettings::class]],

diff --git a/protected/humhub/modules/admin/controllers/UserController.php b/protected/humhub/modules/admin/controllers/UserController.php
@@ -55,7 +55,7 @@ public function init()
     /**
      * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [
             ['permissions' => [ManageUsers::class, ManageGroups::class]],

diff --git a/protected/humhub/modules/admin/controllers/UserPeopleController.php b/protected/humhub/modules/admin/controllers/UserPeopleController.php
@@ -40,7 +40,7 @@ public function init()
     /**
      * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [
             ['permissions' => [ManageSettings::class]]

diff --git a/protected/humhub/modules/admin/controllers/UserPermissionsController.php b/protected/humhub/modules/admin/controllers/UserPermissionsController.php
@@ -11,13 +11,10 @@
 use humhub\modules\admin\permissions\ManageSettings;
 use humhub\modules\admin\permissions\ManageUsers;
 use humhub\modules\content\components\ContentContainerDefaultPermissionManager;
-use humhub\modules\content\models\ContentContainerDefaultPermission;
 use humhub\modules\content\models\ContentContainerPermission;
-use humhub\modules\content\models\ContentContainerSetting;
 use humhub\modules\user\models\User;
 use humhub\modules\user\Module;
 use Yii;
-use yii\db\Expression;
 use yii\web\HttpException;
 
 /**
@@ -47,7 +44,7 @@ public function init()
     /**
      * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [
             ['permissions' => [ManageUsers::class]],

diff --git a/protected/humhub/modules/admin/controllers/UserProfileController.php b/protected/humhub/modules/admin/controllers/UserProfileController.php
@@ -39,13 +39,13 @@ public function init()
         $this->appendPageTitle(Yii::t('AdminModule.base', 'Userprofiles'));
         $this->subLayout = '@admin/views/layouts/user';
 
-        return parent::init();
+        parent::init();
     }
 
     /**
      * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [
             ['permissions' => ManageUsers::class]

diff --git a/protected/humhub/modules/comment/controllers/CommentController.php b/protected/humhub/modules/comment/controllers/CommentController.php
@@ -39,9 +39,9 @@
 class CommentController extends Controller
 {
     /**
-     * @return array
+     * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [
             [ControllerAccess::RULE_LOGGED_IN_ONLY => ['post', 'edit', 'delete']],

diff --git a/protected/humhub/modules/file/controllers/FileController.php b/protected/humhub/modules/file/controllers/FileController.php
@@ -31,7 +31,7 @@ class FileController extends Controller
     /**
      * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [
             [ControllerAccess::RULE_LOGGED_IN_ONLY => ['upload', 'delete']]

diff --git a/protected/humhub/modules/ldap/controllers/AdminController.php b/protected/humhub/modules/ldap/controllers/AdminController.php
@@ -25,9 +25,9 @@
 class AdminController extends Controller
 {
     /**
-     * @inerhitdoc
+     * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [
             ['permissions' => [ManageSettings::class]],

diff --git a/protected/humhub/modules/marketplace/controllers/BrowseController.php b/protected/humhub/modules/marketplace/controllers/BrowseController.php
@@ -26,7 +26,7 @@ class BrowseController extends Controller
     /**
      * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [
             ['permissions' => ManageModules::class]

diff --git a/protected/humhub/modules/marketplace/controllers/LicenceController.php b/protected/humhub/modules/marketplace/controllers/LicenceController.php
@@ -24,7 +24,7 @@ class LicenceController extends Controller
     /**
      * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [
             ['permissions' => ManageModules::class]

diff --git a/protected/humhub/modules/marketplace/controllers/PurchaseController.php b/protected/humhub/modules/marketplace/controllers/PurchaseController.php
@@ -32,7 +32,7 @@ class PurchaseController extends Controller
     /**
      * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [
             ['permissions' => ManageModules::class]

diff --git a/protected/humhub/modules/marketplace/controllers/UpdateController.php b/protected/humhub/modules/marketplace/controllers/UpdateController.php
@@ -23,7 +23,7 @@ class UpdateController extends Controller
     /**
      * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [
             ['permissions' => ManageModules::class]

diff --git a/protected/humhub/modules/notification/controllers/AdminController.php b/protected/humhub/modules/notification/controllers/AdminController.php
@@ -25,7 +25,7 @@ class AdminController extends Controller
     /**
      * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [
             ['permissions' => ManageSettings::class],

diff --git a/protected/humhub/modules/notification/controllers/EntryController.php b/protected/humhub/modules/notification/controllers/EntryController.php
@@ -30,7 +30,7 @@ class EntryController extends Controller
     /**
      * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [
             [ControllerAccess::RULE_LOGGED_IN_ONLY]

diff --git a/protected/humhub/modules/notification/controllers/ListController.php b/protected/humhub/modules/notification/controllers/ListController.php
@@ -22,9 +22,9 @@
 class ListController extends Controller
 {
     /**
-     * @inheritDoc
+     * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [
             [ControllerAccess::RULE_LOGGED_IN_ONLY]

diff --git a/protected/humhub/modules/notification/controllers/OverviewController.php b/protected/humhub/modules/notification/controllers/OverviewController.php
@@ -29,7 +29,7 @@ class OverviewController extends Controller
     /**
      * @inheritdoc
      */
-    public function getAccessRules()
+    protected function getAccessRules()
     {
         return [
             [ControllerAccess::RULE_LOGGED_IN_ONLY]