Fix #6744: Make sure to call humhub\components\Module::update() on Mo… (

#6799) * Fix #6744: Make sure to call humhub\components\Module::update() on Module update * Added beforeUpdate and AfterUpdate deprecated --------- Co-authored-by: Marc Farré <contact@marc.fun>
humhub · Jan 16, 2024 · c5322bd · c5322bd
1 parent ac98aa3
commit c5322bd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ HumHub Changelog
 -------------------
 - Enh #6779: Added Twig Sandbox Extension for Statistic Tracking Codes
 - Fix #6791: Fix number of filtered modules on Marketplace
+- Fix #6744: Make sure to call `humhub\components\Module::update()` on Module updates
 - Fix #6796: Files in the RichText doesn't open as new tab
 
 1.15.2 (December 19, 2023)

diff --git a/protected/humhub/components/Module.php b/protected/humhub/components/Module.php
@@ -320,7 +320,7 @@ protected function getModuleInfo()
      */
     public function update()
     {
-        if($this->beforeUpdate() !== false) {
+        if ($this->beforeUpdate() !== false) {
             $this->migrate();
             $this->afterUpdate();
         }
@@ -332,6 +332,8 @@ public function update()
      * The update will cancel if this function does return false;
      *
      * @return bool
+     * @deprecated
+     *
      */
     public function beforeUpdate()
     {
@@ -341,6 +343,8 @@ public function beforeUpdate()
 
     /**
      * Called right after the module update.
+     *
+     * @deprecated
      */
     public function afterUpdate()
     {
@@ -364,9 +368,9 @@ public function getConfigUrl()
      * This function should also make sure the module is installed on the given container in case the permission
      * only affects installed features.
      *
-     * @since 0.21
      * @param \humhub\modules\content\components\ContentContainerActiveRecord $contentContainer optional contentcontainer
      * @return array list of permissions
+     * @since 0.21
      */
     public function getPermissions($contentContainer = null)
     {
@@ -376,8 +380,8 @@ public function getPermissions($contentContainer = null)
     /**
      * Returns a list of notification classes this module provides.
      *
-     * @since 1.1
      * @return array list of notification classes
+     * @since 1.1
      */
     public function getNotifications()
     {
@@ -405,8 +409,8 @@ public function getNotifications()
     /**
      * Determines whether the module has notification classes or not
      *
-     * @since 1.2
      * @return boolean has notifications
+     * @since 1.2
      */
     public function hasNotifications()
     {
@@ -416,8 +420,8 @@ public function hasNotifications()
     /**
      * Returns a list of activity class names this modules provides.
      *
-     * @since 1.2
      * @return array list of activity class names
+     * @since 1.2
      */
     public function getActivityClasses()
     {
@@ -445,8 +449,8 @@ public function getActivityClasses()
     /**
      * Returns a list of asset class names this modules provides.
      *
-     * @since 1.2.8
      * @return array list of asset class names
+     * @since 1.2.8
      */
     public function getAssetClasses()
     {
@@ -461,7 +465,7 @@ public function getAssetClasses()
         $assetDirectory = $this->getBasePath() . DIRECTORY_SEPARATOR . 'assets';
         if (is_dir($assetDirectory)) {
             foreach (FileHelper::findFiles($assetDirectory, ['recursive' => false,]) as $file) {
-                $assetClass =  $assetNamespace . '\\' . basename($file, '.php');
+                $assetClass = $assetNamespace . '\\' . basename($file, '.php');
                 if (is_subclass_of($assetClass, AssetBundle::class)) {
                     $assets[] = $assetClass;
                 }

diff --git a/protected/humhub/modules/marketplace/components/OnlineModuleManager.php b/protected/humhub/modules/marketplace/components/OnlineModuleManager.php
@@ -173,7 +173,7 @@ public function update($moduleId)
         $this->install($moduleId);
 
         $updatedModule = Yii::$app->moduleManager->getModule($moduleId);
-        $updatedModule->migrate();
+        $updatedModule->update();
 
         (new MarketplaceService())->refreshPendingModuleUpdateCount();