[v1.19] Update for HumHub 1.19

.github/workflows/codeception-min-version.yml

@@ -13,3 +13,4 @@ jobs:
     with:
       module-id: tasks
       use-rest-module: true
+      rest-module-branch: develop

Events.php

@@ -9,28 +9,33 @@
 
 namespace humhub\modules\tasks;
 
+use humhub\commands\IntegrityController;
+use humhub\helpers\ControllerHelper;
 use humhub\modules\content\components\ContentContainerActiveRecord;
+use humhub\modules\dashboard\widgets\Sidebar as DashboardSidebar;
+use humhub\modules\notification\models\Notification;
 use humhub\modules\rest\Module as RestModule;
-use humhub\modules\space\models\Space;
+use humhub\modules\space\widgets\Menu as SpaceMenu;
+use humhub\modules\space\widgets\Sidebar as SpaceSidebar;
 use humhub\modules\tasks\extensions\custom_pages\elements\TaskElement;
 use humhub\modules\tasks\extensions\custom_pages\elements\TasksElement;
 use humhub\modules\tasks\helpers\TaskListUrl;
 use humhub\modules\tasks\helpers\TaskUrl;
-use humhub\modules\user\models\User;
-use Yii;
-use humhub\modules\notification\models\Notification;
 use humhub\modules\tasks\jobs\SendReminder;
 use humhub\modules\tasks\models\SnippetModuleSettings;
 use humhub\modules\tasks\models\Task;
 use humhub\modules\tasks\models\checklist\TaskItem;
 use humhub\modules\tasks\models\scheduling\TaskReminder;
+use humhub\modules\tasks\models\user\TaskUser;
 use humhub\modules\tasks\integration\calendar\TaskCalendar;
 use humhub\modules\tasks\widgets\MyTasks;
-use humhub\modules\tasks\models\user\TaskUser;
+use humhub\modules\ui\menu\MenuLink;
+use humhub\modules\user\models\User;
+use humhub\modules\user\widgets\ProfileMenu;
+use humhub\widgets\TopMenu;
+use Yii;
 use yii\db\Expression;
 
-/* @var $user \humhub\modules\user\models\User */
-
 /**
  * Created by PhpStorm.
  * User: davidborn
@@ -45,28 +50,29 @@ public static function onTopMenuInit($event)
             /* @var $module Module */
             $module = Yii::$app->getModule('tasks');
 
-
             if (!$module->settings->get('showGlobalMenuItem', false) || Yii::$app->user->isGuest) {
                 return;
             }
 
+            /* @var TopMenu $menu */
+            $menu = $event->sender;
+
             // Is Module enabled on this workspace?
-            $event->sender->addItem([
+            $menu->addEntry(new MenuLink([
                 'label' => Yii::t('TasksModule.base', 'Tasks'),
                 'id' => 'tasks-global',
                 'icon' => 'tasks',
                 'url' => TaskUrl::globalView(),
                 'sortOrder' => $module->settings->get('menuSortOrder', 500),
-                'isActive' => (Yii::$app->controller->module && Yii::$app->controller->module->id == 'tasks' && Yii::$app->controller->id == 'global'),
-            ]);
+                'isActive' => ControllerHelper::isActivePath('tasks', 'global'),
+            ]));
         } catch (\Throwable $e) {
             Yii::error($e);
         }
     }
 
     /**
-     * @param $event \humhub\modules\calendar\interfaces\CalendarItemTypesEvent
-     * @return mixed
+     * @param $event \humhub\modules\calendar\interfaces\event\CalendarItemTypesEvent
      */
     public static function onGetCalendarItemTypes($event)
     {
@@ -83,7 +89,7 @@ public static function onGetCalendarItemTypes($event)
     }
 
     /**
-     * @param $event \humhub\modules\calendar\interfaces\CalendarItemsEvent;
+     * @param $event \humhub\modules\calendar\interfaces\event\CalendarItemsEvent;
      */
     public static function onFindCalendarItems($event)
     {
@@ -109,7 +115,9 @@ public static function onDashboardSidebarInit($event)
             $settings = SnippetModuleSettings::instantiate();
 
             if ($settings->showMyTasksSnippet()) {
-                $event->sender->addWidget(MyTasks::class, ['limit' => $settings->myTasksSnippetMaxItems], ['sortOrder' => $settings->myTasksSnippetSortOrder]);
+                /* @var DashboardSidebar $sidebar */
+                $sidebar = $event->sender;
+                $sidebar->addWidget(MyTasks::class, ['limit' => $settings->myTasksSnippetMaxItems], ['sortOrder' => $settings->myTasksSnippetSortOrder]);
             }
         } catch (\Throwable $e) {
             Yii::error($e);
@@ -123,15 +131,17 @@ public static function onSpaceSidebarInit($event)
                 return;
             }
 
-            /* @var $space Space */
-            $space = $event->sender->space;
+            /* @var SpaceSidebar $sidebar */
+            $sidebar = $event->sender;
 
-            if ($space->moduleManager->isEnabled('tasks') && $space->isMember()) {
+            if ($sidebar->space->moduleManager->isEnabled('tasks') && $sidebar->space->isMember()) {
                 $settings = SnippetModuleSettings::instantiate();
                 if ($settings->showMyTasksSnippetSpace()) {
-                    $event->sender->addWidget(MyTasks::class, [
-                        'contentContainer' => $space,
-                        'limit' => $settings->myTasksSnippetMaxItems], ['sortOrder' => $settings->myTasksSnippetSortOrder]);
+                    $sidebar->addWidget(
+                        MyTasks::class,
+                        ['contentContainer' => $sidebar->space, 'limit' => $settings->myTasksSnippetMaxItems],
+                        ['sortOrder' => $settings->myTasksSnippetSortOrder],
+                    );
                 }
             }
         } catch (\Throwable $e) {
@@ -142,17 +152,16 @@ public static function onSpaceSidebarInit($event)
     public static function onSpaceMenuInit($event)
     {
         try {
-            /* @var $space Space */
-            $space = $event->sender->space;
+            /* @var SpaceMenu $menu */
+            $menu = $event->sender;
 
-            if ($space->moduleManager->isEnabled('tasks') && $space->isMember()) {
-                $event->sender->addItem([
+            if ($menu->space->moduleManager->isEnabled('tasks') && $menu->space->isMember()) {
+                $menu->addEntry(new MenuLink([
                     'label' => Yii::t('TasksModule.base', 'Tasks'),
-                    'group' => 'modules',
-                    'url' => TaskListUrl::taskListRoot($space),
+                    'url' => TaskListUrl::taskListRoot($menu->space),
                     'icon' => 'tasks',
-                    'isActive' => (Yii::$app->controller->module && Yii::$app->controller->module->id == 'tasks'),
-                ]);
+                    'isActive' => ControllerHelper::isActivePath('tasks'),
+                ]));
             }
         } catch (\Throwable $e) {
             Yii::error($e);
@@ -161,16 +170,17 @@ public static function onSpaceMenuInit($event)
 
     public static function onProfileMenuInit($event)
     {
-        /* @var $user User */
         try {
-            $user = $event->sender->user;
-            if ($user->moduleManager->isEnabled('tasks')) {
-                $event->sender->addItem([
+            /* @var ProfileMenu $menu */
+            $menu = $event->sender;
+
+            if ($menu->user->moduleManager->isEnabled('tasks')) {
+                $menu->addEntry(new MenuLink([
                     'label' => Yii::t('TasksModule.base', 'Tasks'),
-                    'url' => TaskListUrl::taskListRoot($user),
+                    'url' => TaskListUrl::taskListRoot($menu->user),
                     'icon' => 'tasks',
-                    'isActive' => (Yii::$app->controller->module && Yii::$app->controller->module->id == 'tasks'),
-                ]);
+                    'isActive' => ControllerHelper::isActivePath('tasks'),
+                ]));
             }
         } catch (\Throwable $e) {
             Yii::error($e);
@@ -186,6 +196,7 @@ public static function onProfileMenuInit($event)
      */
     public static function onIntegrityCheck($event)
     {
+        /* @var IntegrityController $integrityController */
         $integrityController = $event->sender;
         $integrityController->showTestHeadline("Tasks Module - Entries (" . Task::find()->count() . " entries)");
 

Module.php

@@ -2,7 +2,6 @@
 
 namespace humhub\modules\tasks;
 
-use humhub\components\console\Application as ConsoleApplication;
 use humhub\modules\tasks\helpers\TaskUrl;
 use humhub\modules\tasks\models\forms\ConfigureContainerForm;
 use humhub\modules\tasks\models\lists\TaskList;
@@ -24,19 +23,6 @@ class Module extends ContentContainerModule
      */
     public $searchPaginationSize = 30;
 
-    /**
-     * @inheritdoc
-     */
-    public function init()
-    {
-        parent::init();
-
-        if (Yii::$app instanceof ConsoleApplication) {
-            // Prevents the Yii HelpCommand from crawling all web controllers and possibly throwing errors at REST endpoints if the REST module is not available.
-            $this->controllerNamespace = 'tasks/commands';
-        }
-    }
-
     /**
      * @inheritdoc
      */

activities/TaskCompletedActivity.php

@@ -1,19 +1,14 @@
 <?php
 
-/**
- * @link https://www.humhub.org/
- * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG
- * @license https://www.humhub.com/licences
- *
- */
-
 namespace humhub\modules\tasks\activities;
 
-use humhub\modules\activity\components\BaseActivity;
+use humhub\modules\activity\components\BaseContentActivity;
+use Yii;
 
-class TaskCompletedActivity extends BaseActivity
+class TaskCompletedActivity extends BaseContentActivity
 {
-    public $moduleId = 'tasks';
-    public $viewName = "taskCompleted";
-
+    protected function getMessage(array $params): string
+    {
+        return Yii::t('TasksModule.base', '{displayName} completed task "{contentTitle}".', $params);
+    }
 }

activities/TaskResetActivity.php

@@ -1,19 +1,14 @@
 <?php
 
-/**
- * @link https://www.humhub.org/
- * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG
- * @license https://www.humhub.com/licences
- *
- */
-
 namespace humhub\modules\tasks\activities;
 
-use humhub\modules\activity\components\BaseActivity;
+use humhub\modules\activity\components\BaseContentActivity;
+use Yii;
 
-class TaskResetActivity extends BaseActivity
+class TaskResetActivity extends BaseContentActivity
 {
-    public $moduleId = 'tasks';
-    public $viewName = "taskReset";
-
+    protected function getMessage(array $params): string
+    {
+        return Yii::t('TasksModule.base', '{displayName} reset task "{contentTitle}".', $params);
+    }
 }

activities/TaskReviewedActivity.php

@@ -1,19 +1,14 @@
 <?php
 
-/**
- * @link https://www.humhub.org/
- * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG
- * @license https://www.humhub.com/licences
- *
- */
-
 namespace humhub\modules\tasks\activities;
 
-use humhub\modules\activity\components\BaseActivity;
+use humhub\modules\activity\components\BaseContentActivity;
+use Yii;
 
-class TaskReviewedActivity extends BaseActivity
+class TaskReviewedActivity extends BaseContentActivity
 {
-    public $moduleId = 'tasks';
-    public $viewName = "taskReviewed";
-
+    protected function getMessage(array $params): string
+    {
+        return Yii::t('TasksModule.base', '{displayName} reviewed task "{contentTitle}".', $params);
+    }
 }

activities/TaskStartActivity.php

@@ -1,19 +1,14 @@
 <?php
 
-/**
- * @link https://www.humhub.org/
- * @copyright Copyright (c) 2018 HumHub GmbH & Co. KG
- * @license https://www.humhub.com/licences
- *
- */
-
 namespace humhub\modules\tasks\activities;
 
-use humhub\modules\activity\components\BaseActivity;
+use humhub\modules\activity\components\BaseContentActivity;
+use Yii;
 
-class TaskStartActivity extends BaseActivity
+class TaskStartActivity extends BaseContentActivity
 {
-    public $moduleId = 'tasks';
-    public $viewName = "taskStart";
-
+    protected function getMessage(array $params): string
+    {
+        return Yii::t('TasksModule.base', '{displayName} works on task "{contentTitle}".', $params);
+    }
 }