Revert "Fix visibility of the method Controller::getAccessRules()"

humhub · Oct 26, 2023 · 14a89ee · 14a89ee
1 parent 6b4d796
commit 14a89ee
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 20 deletions.
diff --git a/controllers/ConfigController.php b/controllers/ConfigController.php
@@ -21,7 +21,7 @@ class ConfigController extends AbstractConfigController
     /**
      * @inheritdoc
      */
-    protected function getAccessRules()
+    public function getAccessRules()
     {
         return [['permissions' => ManageModules::class]];
     }
@@ -57,4 +57,4 @@ public function actionMenu()
         ]);
     }
 
-}
+}
diff --git a/controllers/ContainerConfigController.php b/controllers/ContainerConfigController.php
@@ -24,10 +24,10 @@ class ContainerConfigController extends AbstractConfigController
     /**
      * @inheritdoc
      */
-    protected function getAccessRules()
+    public function getAccessRules()
     {
         return [
           ['permission' => [ManageSpaces::class, ManageEntry::class]]
         ];
     }
-}
+}
diff --git a/controllers/FullCalendarController.php b/controllers/FullCalendarController.php
@@ -12,9 +12,9 @@
 class FullCalendarController extends Controller
 {
     /**
-     * @inheritdoc
+     * @inheritdocs
      */
-    protected function getAccessRules()
+    public function getAccessRules()
     {
         return [
             ['login'],
@@ -67,4 +67,4 @@ public function actionUpdate($id)
         return $this->asJson(['success' => false, 'error' => $result]);
     }
 
-}
+}
diff --git a/controllers/GlobalController.php b/controllers/GlobalController.php
@@ -11,6 +11,7 @@
 use humhub\modules\calendar\models\CalendarEntryDummy;
 use humhub\modules\calendar\models\fullcalendar\FullCalendar;
 use humhub\modules\calendar\models\SnippetModuleSettings;
+use humhub\modules\calendar\permissions\CreateEntry;
 use humhub\modules\calendar\widgets\FilterType;
 use humhub\modules\content\components\ContentContainerModuleManager;
 use humhub\modules\content\models\ContentContainer;
@@ -43,9 +44,9 @@ class GlobalController extends Controller
     public $calendarService;
 
     /**
-     * @inheritdoc
+     * @return array
      */
-    protected function getAccessRules()
+    public function getAccessRules()
     {
         return [
             ['login' => ['enable', 'select']]

diff --git a/controllers/IcalController.php b/controllers/IcalController.php
@@ -28,9 +28,9 @@ class IcalController extends Controller
     const EXPORT_MIME = 'text/calendar';
 
     /**
-     * @inheritdoc
+     * @return array
      */
-    protected function getAccessRules()
+    public function getAccessRules()
     {
         return [
             [ControllerAccess::RULE_LOGGED_IN_ONLY]
@@ -106,4 +106,4 @@ public function getEvent($id)
 
         return $event;
     }
-}
+}
diff --git a/controllers/ReminderController.php b/controllers/ReminderController.php
@@ -20,9 +20,9 @@
 class ReminderController extends ContentContainerController
 {
     /**
-     * @inheritdoc
+     * @return array
      */
-    protected function getAccessRules()
+    public function getAccessRules()
     {
         return [
             [ControllerAccess::RULE_LOGGED_IN_ONLY]
@@ -62,4 +62,4 @@ public function actionSet($id)
 
         return $this->renderAjax('userLevelReminder', ['reminderSettings' => $reminderSettings]);
     }
-}
+}
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,10 +1,6 @@
 Changelog
 =========
 
-1.5.5 - (Unreleased)
--------------------------
-- Fix #430: Fix visibility of the method `Controller::getAccessRules()`
-
 1.5.4 - (October 5, 2023)
 -------------------------
 - Enh #424: Tests for `next` version

diff --git a/module.json b/module.json
@@ -3,7 +3,7 @@
     "name": "Calendar",
     "description": "Calendar for spaces or user profiles.",
     "keywords": ["calendar"],
-    "version": "1.5.5",
+    "version": "1.5.4",
     "humhub": {
         "minVersion": "1.14"
     },